diff --git a/.gitattributes b/.gitattributes index 8db69e6189..1407f4ac4b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4662,7 +4662,6 @@ lcl/include/canvas.inc svneol=native#text/pascal lcl/include/checkbox.inc svneol=native#text/pascal lcl/include/clipbrd.inc svneol=native#text/pascal lcl/include/colorbutton.inc svneol=native#text/pascal -lcl/include/colordialog.inc svneol=native#text/pascal lcl/include/commondialog.inc svneol=native#text/pascal lcl/include/containedaction.inc svneol=native#text/pascal lcl/include/control.inc svneol=native#text/pascal @@ -4743,6 +4742,7 @@ lcl/include/intfbasewinapi.inc svneol=native#text/pascal lcl/include/jpegimage.inc svneol=native#text/pascal lcl/include/lcl_defines.inc svneol=native#text/pascal lcl/include/lclaction.inc svneol=native#text/pascal +lcl/include/lclcolordialog.inc svneol=native#text/pascal lcl/include/lclintf.inc svneol=native#text/pascal lcl/include/lclintfh.inc svneol=native#text/pascal lcl/include/listcolumn.inc svneol=native#text/pascal @@ -4994,7 +4994,6 @@ lcl/interfaces/fpgui/fpguiwinapih.inc svneol=native#text/plain lcl/interfaces/fpgui/fpguiwsarrow.pp svneol=native#text/pascal lcl/interfaces/fpgui/fpguiwsbuttons.pp svneol=native#text/pascal lcl/interfaces/fpgui/fpguiwscalendar.pp svneol=native#text/pascal -lcl/interfaces/fpgui/fpguiwschecklst.pp svneol=native#text/pascal lcl/interfaces/fpgui/fpguiwscomctrls.pp svneol=native#text/pascal lcl/interfaces/fpgui/fpguiwscontrols.pp svneol=native#text/pascal lcl/interfaces/fpgui/fpguiwsdialogs.pp svneol=native#text/pascal @@ -5007,7 +5006,6 @@ lcl/interfaces/fpgui/fpguiwsimglist.pp svneol=native#text/pascal lcl/interfaces/fpgui/fpguiwsmenus.pp svneol=native#text/pascal lcl/interfaces/fpgui/fpguiwspairsplitter.pp svneol=native#text/pascal lcl/interfaces/fpgui/fpguiwsprivate.pp svneol=native#text/plain -lcl/interfaces/fpgui/fpguiwsspin.pp svneol=native#text/pascal lcl/interfaces/fpgui/fpguiwsstdctrls.pp svneol=native#text/pascal lcl/interfaces/fpgui/interfaces.pp svneol=native#text/pascal lcl/interfaces/gtk/Makefile.compiled svneol=native#text/plain diff --git a/lcl/dialogs.pp b/lcl/dialogs.pp index f5ba4f50e5..6ae9b31f77 100644 --- a/lcl/dialogs.pp +++ b/lcl/dialogs.pp @@ -684,7 +684,7 @@ begin Result := CreateBitmapFromLazarusResource(DialogResName[idDiag]); end; -{$I colordialog.inc} +{$I lclcolordialog.inc} {$I commondialog.inc} {$I filedialog.inc} {$I finddialog.inc} diff --git a/lcl/include/colordialog.inc b/lcl/include/lclcolordialog.inc similarity index 100% rename from lcl/include/colordialog.inc rename to lcl/include/lclcolordialog.inc diff --git a/lcl/interfaces/fpgui/alllclintfunits.pas b/lcl/interfaces/fpgui/alllclintfunits.pas index cbd77273ad..397210d385 100644 --- a/lcl/interfaces/fpgui/alllclintfunits.pas +++ b/lcl/interfaces/fpgui/alllclintfunits.pas @@ -12,8 +12,6 @@ uses fpguiwsforms, fpguiwsbuttons, fpguiobjects, - fpguiwschecklst, - fpguiwsspin, fpguiwsfactory, fpguiproc, fpguiwsextctrls, @@ -22,7 +20,7 @@ uses fpguiwsgrids, fpguiwsimglist, fpguiwsarrow, - fpguiwsmenus, - fpguiwscalendar; + //fpguiwscalendar, + fpguiwsmenus; implementation end. diff --git a/lcl/interfaces/fpgui/fpguiwschecklst.pp b/lcl/interfaces/fpgui/fpguiwschecklst.pp deleted file mode 100644 index 0e1e584a29..0000000000 --- a/lcl/interfaces/fpgui/fpguiwschecklst.pp +++ /dev/null @@ -1,63 +0,0 @@ -{ $Id: FpGuiwschecklst.pp 5319 2004-03-17 20:11:29Z marc $} -{ - ***************************************************************************** - * FpGuiWSCheckLst.pp * - * --------------- * - * * - * * - ***************************************************************************** - - ***************************************************************************** - * * - * This file is part of the Lazarus Component Library (LCL) * - * * - * See the file COPYING.LCL, included in this distribution, * - * for details about the copyright. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * * - ***************************************************************************** -} -unit FpGuiWSCheckLst; - -{$mode objfpc}{$H+} - -interface - -uses -//////////////////////////////////////////////////// -// I M P O R T A N T -//////////////////////////////////////////////////// -// To get as little as posible circles, -// uncomment only when needed for registration -//////////////////////////////////////////////////// -// CheckLst, -//////////////////////////////////////////////////// - WSCheckLst, WSLCLClasses; - -type - - { TFpGuiWSCheckListBox } - - TFpGuiWSCheckListBox = class(TWSCheckListBox) - private - protected - public - end; - - -implementation - -initialization - -//////////////////////////////////////////////////// -// I M P O R T A N T -//////////////////////////////////////////////////// -// To improve speed, register only classes -// which actually implement something -//////////////////////////////////////////////////// -// RegisterWSComponent(TCheckListBox, TFpGuiWSCheckListBox); -//////////////////////////////////////////////////// -end. diff --git a/lcl/interfaces/fpgui/fpguiwscomctrls.pp b/lcl/interfaces/fpgui/fpguiwscomctrls.pp index d5f4679737..83e48f0b4c 100644 --- a/lcl/interfaces/fpgui/fpguiwscomctrls.pp +++ b/lcl/interfaces/fpgui/fpguiwscomctrls.pp @@ -116,22 +116,6 @@ type public end; - { TFpGuiWSToolButton } - - TFpGuiWSToolButton = class(TWSToolButton) - private - protected - public - end; - - { TFpGuiWSToolBar } - - TFpGuiWSToolBar = class(TWSToolBar) - private - protected - public - end; - { TFpGuiWSTrackBar } TFpGuiWSTrackBar = class(TWSTrackBar) diff --git a/lcl/interfaces/fpgui/fpguiwsspin.pp b/lcl/interfaces/fpgui/fpguiwsspin.pp deleted file mode 100644 index 8effe50164..0000000000 --- a/lcl/interfaces/fpgui/fpguiwsspin.pp +++ /dev/null @@ -1,72 +0,0 @@ -{ $Id: FpGuiwsspin.pp 5319 2004-03-17 20:11:29Z marc $} -{ - ***************************************************************************** - * FpGuiWSSpin.pp * - * ----------- * - * * - * * - ***************************************************************************** - - ***************************************************************************** - * * - * This file is part of the Lazarus Component Library (LCL) * - * * - * See the file COPYING.LCL, included in this distribution, * - * for details about the copyright. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * * - ***************************************************************************** -} -unit FpGuiWSSpin; - -{$mode objfpc}{$H+} - -interface - -uses -//////////////////////////////////////////////////// -// I M P O R T A N T -//////////////////////////////////////////////////// -// To get as little as posible circles, -// uncomment only when needed for registration -//////////////////////////////////////////////////// -// Spin, -//////////////////////////////////////////////////// - WSSpin, WSLCLClasses; - -type - - { TFpGuiWSCustomSpinEdit } - - TFpGuiWSCustomSpinEdit = class(TWSCustomSpinEdit) - private - protected - public - end; - - { TFpGuiWSSpinEdit } - - TFpGuiWSSpinEdit = class(TWSSpinEdit) - private - protected - public - end; - - -implementation - -initialization - -//////////////////////////////////////////////////// -// I M P O R T A N T -//////////////////////////////////////////////////// -// To improve speed, register only classes -// which actually implement something -//////////////////////////////////////////////////// -// RegisterWSComponent(TCustomSpinEdit, TFpGuiWSCustomSpinEdit); -// RegisterWSComponent(TSpinEdit, TFpGuiWSSpinEdit); -//////////////////////////////////////////////////// -end. diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index 7e84842e34..b7a91a5333 100644 --- a/lcl/interfaces/lcl.lpk +++ b/lcl/interfaces/lcl.lpk @@ -101,7 +101,7 @@ end;"/> - + @@ -516,987 +516,977 @@ end;"/> - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - + + - - + + - - + + - - + + - - + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - - + + - - + + - - + + - - + + + + + + + + + + - + - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + - + - + - + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + - - + + - - + + + + + + + + + + - + - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + - + - - - - - - - - - - + + - - + + - - + + - - + + - - + + + + + + + + + + - + - + - - - - - - - - - - + + - - + + + + + + + + + + - + - - - - - - - - - - + + - - + + - - + + + + + + + + + + - + - + - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + - + - + - + - + - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + - + - + - + - + - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -1519,6 +1509,5 @@ end;"/> - diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk index 887f78cdf7..d144fd7098 100644 --- a/lcl/lclbase.lpk +++ b/lcl/lclbase.lpk @@ -493,714 +493,714 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + @@ -1220,6 +1220,5 @@ -