Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxOS2 build fixes after wxColourBase introduction.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-24 16:34:26 +00:00
parent e21f75bdf6
commit 6b5d2431fc
4 changed files with 75 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
build/os2/makefile.wat
View File

@@ -261,6 +261,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_bookctrl.obj &
$(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_choiccmn.obj &
$(OBJS)\monodll_clipcmn.obj & $(OBJS)\monodll_clipcmn.obj &
$(OBJS)\monodll_colourcmn.obj &
$(OBJS)\monodll_cmdproc.obj & $(OBJS)\monodll_cmdproc.obj &
$(OBJS)\monodll_cmndata.obj & $(OBJS)\monodll_cmndata.obj &
$(OBJS)\monodll_containr.obj & $(OBJS)\monodll_containr.obj &
@@ -414,6 +415,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_bookctrl.obj &
$(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_choiccmn.obj &
$(OBJS)\monodll_clipcmn.obj & $(OBJS)\monodll_clipcmn.obj &
$(OBJS)\monodll_colourcmn.obj &
$(OBJS)\monodll_cmdproc.obj & $(OBJS)\monodll_cmdproc.obj &
$(OBJS)\monodll_cmndata.obj & $(OBJS)\monodll_cmndata.obj &
$(OBJS)\monodll_containr.obj & $(OBJS)\monodll_containr.obj &
@@ -511,6 +513,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =
!ifeq WXUNIV 0 !ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_OBJECTS = & ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_datavcmn.obj & $(OBJS)\monodll_datavcmn.obj &
$(OBJS)\monodll_buttonbar.obj &
$(OBJS)\monodll_calctrl.obj & $(OBJS)\monodll_calctrl.obj &
$(OBJS)\monodll_datavgen.obj & $(OBJS)\monodll_datavgen.obj &
$(OBJS)\monodll_datectlg.obj & $(OBJS)\monodll_datectlg.obj &
@@ -535,6 +538,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
!ifeq WXUNIV 1 !ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_OBJECTS = & ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_datavcmn.obj & $(OBJS)\monodll_datavcmn.obj &
$(OBJS)\monodll_buttonbar.obj &
$(OBJS)\monodll_calctrl.obj & $(OBJS)\monodll_calctrl.obj &
$(OBJS)\monodll_datavgen.obj & $(OBJS)\monodll_datavgen.obj &
$(OBJS)\monodll_datectlg.obj & $(OBJS)\monodll_datectlg.obj &
@@ -736,6 +740,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_bookctrl.obj &
$(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_choiccmn.obj &
$(OBJS)\monolib_clipcmn.obj & $(OBJS)\monolib_clipcmn.obj &
$(OBJS)\monolib_colourcmn.obj &
$(OBJS)\monolib_cmdproc.obj & $(OBJS)\monolib_cmdproc.obj &
$(OBJS)\monolib_cmndata.obj & $(OBJS)\monolib_cmndata.obj &
$(OBJS)\monolib_containr.obj & $(OBJS)\monolib_containr.obj &
@@ -889,6 +894,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_bookctrl.obj &
$(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_choiccmn.obj &
$(OBJS)\monolib_clipcmn.obj & $(OBJS)\monolib_clipcmn.obj &
$(OBJS)\monolib_colourcmn.obj &
$(OBJS)\monolib_cmdproc.obj & $(OBJS)\monolib_cmdproc.obj &
$(OBJS)\monolib_cmndata.obj & $(OBJS)\monolib_cmndata.obj &
$(OBJS)\monolib_containr.obj & $(OBJS)\monolib_containr.obj &
@@ -986,6 +992,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
!ifeq WXUNIV 0 !ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_1_OBJECTS = & ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_datavcmn.obj & $(OBJS)\monolib_datavcmn.obj &
$(OBJS)\monolib_buttonbar.obj &
$(OBJS)\monolib_calctrl.obj & $(OBJS)\monolib_calctrl.obj &
$(OBJS)\monolib_datavgen.obj & $(OBJS)\monolib_datavgen.obj &
$(OBJS)\monolib_datectlg.obj & $(OBJS)\monolib_datectlg.obj &
@@ -1010,6 +1017,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
!ifeq WXUNIV 1 !ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_1_OBJECTS = & ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_datavcmn.obj & $(OBJS)\monolib_datavcmn.obj &
$(OBJS)\monolib_buttonbar.obj &
$(OBJS)\monolib_calctrl.obj & $(OBJS)\monolib_calctrl.obj &
$(OBJS)\monolib_datavgen.obj & $(OBJS)\monolib_datavgen.obj &
$(OBJS)\monolib_datectlg.obj & $(OBJS)\monolib_datectlg.obj &
@@ -1161,6 +1169,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_bookctrl.obj &
$(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_choiccmn.obj &
$(OBJS)\coredll_clipcmn.obj & $(OBJS)\coredll_clipcmn.obj &
$(OBJS)\coredll_colourcmn.obj &
$(OBJS)\coredll_cmdproc.obj & $(OBJS)\coredll_cmdproc.obj &
$(OBJS)\coredll_cmndata.obj & $(OBJS)\coredll_cmndata.obj &
$(OBJS)\coredll_containr.obj & $(OBJS)\coredll_containr.obj &
@@ -1314,6 +1323,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_bookctrl.obj &
$(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_choiccmn.obj &
$(OBJS)\coredll_clipcmn.obj & $(OBJS)\coredll_clipcmn.obj &
$(OBJS)\coredll_colourcmn.obj &
$(OBJS)\coredll_cmdproc.obj & $(OBJS)\coredll_cmdproc.obj &
$(OBJS)\coredll_cmndata.obj & $(OBJS)\coredll_cmndata.obj &
$(OBJS)\coredll_containr.obj & $(OBJS)\coredll_containr.obj &
@@ -1509,6 +1519,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_bookctrl.obj &
$(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_choiccmn.obj &
$(OBJS)\corelib_clipcmn.obj & $(OBJS)\corelib_clipcmn.obj &
$(OBJS)\corelib_colourcmn.obj &
$(OBJS)\corelib_cmdproc.obj & $(OBJS)\corelib_cmdproc.obj &
$(OBJS)\corelib_cmndata.obj & $(OBJS)\corelib_cmndata.obj &
$(OBJS)\corelib_containr.obj & $(OBJS)\corelib_containr.obj &
@@ -1662,6 +1673,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_bookctrl.obj &
$(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_choiccmn.obj &
$(OBJS)\corelib_clipcmn.obj & $(OBJS)\corelib_clipcmn.obj &
$(OBJS)\corelib_colourcmn.obj &
$(OBJS)\corelib_cmdproc.obj & $(OBJS)\corelib_cmdproc.obj &
$(OBJS)\corelib_cmndata.obj & $(OBJS)\corelib_cmndata.obj &
$(OBJS)\corelib_containr.obj & $(OBJS)\corelib_containr.obj &
@@ -1768,6 +1780,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
!ifeq WXUNIV 0 !ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_2_OBJECTS = & ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_datavcmn.obj & $(OBJS)\advdll_datavcmn.obj &
$(OBJS)\advdll_buttonbar.obj &
$(OBJS)\advdll_calctrl.obj & $(OBJS)\advdll_calctrl.obj &
$(OBJS)\advdll_datavgen.obj & $(OBJS)\advdll_datavgen.obj &
$(OBJS)\advdll_datectlg.obj & $(OBJS)\advdll_datectlg.obj &
@@ -1792,6 +1805,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
!ifeq WXUNIV 1 !ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_2_OBJECTS = & ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_datavcmn.obj & $(OBJS)\advdll_datavcmn.obj &
$(OBJS)\advdll_buttonbar.obj &
$(OBJS)\advdll_calctrl.obj & $(OBJS)\advdll_calctrl.obj &
$(OBJS)\advdll_datavgen.obj & $(OBJS)\advdll_datavgen.obj &
$(OBJS)\advdll_datectlg.obj & $(OBJS)\advdll_datectlg.obj &
@@ -1826,6 +1840,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
!ifeq WXUNIV 0 !ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_3_OBJECTS = & ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_datavcmn.obj & $(OBJS)\advlib_datavcmn.obj &
$(OBJS)\advlib_buttonbar.obj &
$(OBJS)\advlib_calctrl.obj & $(OBJS)\advlib_calctrl.obj &
$(OBJS)\advlib_datavgen.obj & $(OBJS)\advlib_datavgen.obj &
$(OBJS)\advlib_datectlg.obj & $(OBJS)\advlib_datectlg.obj &
@@ -1850,6 +1865,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
!ifeq WXUNIV 1 !ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_3_OBJECTS = & ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_datavcmn.obj & $(OBJS)\advlib_datavcmn.obj &
$(OBJS)\advlib_buttonbar.obj &
$(OBJS)\advlib_calctrl.obj & $(OBJS)\advlib_calctrl.obj &
$(OBJS)\advlib_datavgen.obj & $(OBJS)\advlib_datavgen.obj &
$(OBJS)\advlib_datectlg.obj & $(OBJS)\advlib_datectlg.obj &
@@ -3199,7 +3215,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
@%append $(OBJS)\basedll.lbc option caseexact @%append $(OBJS)\basedll.lbc option caseexact
@%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) @%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
@for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\basedll.lbc library %i @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib) do @%append $(OBJS)\basedll.lbc library %i
@%append $(OBJS)\basedll.lbc @%append $(OBJS)\basedll.lbc
@%append $(OBJS)\basedll.lbc system os2v2 dll @%append $(OBJS)\basedll.lbc system os2v2 dll
wlink @$(OBJS)\basedll.lbc wlink @$(OBJS)\basedll.lbc
@@ -3225,7 +3241,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
@%append $(OBJS)\netdll.lbc option caseexact @%append $(OBJS)\netdll.lbc option caseexact
@%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) @%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
@for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i
@%append $(OBJS)\netdll.lbc @%append $(OBJS)\netdll.lbc
@%append $(OBJS)\netdll.lbc system os2v2 dll @%append $(OBJS)\netdll.lbc system os2v2 dll
wlink @$(OBJS)\netdll.lbc wlink @$(OBJS)\netdll.lbc
@@ -3346,7 +3362,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
@%append $(OBJS)\odbcdll.lbc option caseexact @%append $(OBJS)\odbcdll.lbc option caseexact
@%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) @%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
@for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i @for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\odbcdll.lbc library %i @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
@%append $(OBJS)\odbcdll.lbc @%append $(OBJS)\odbcdll.lbc
@%append $(OBJS)\odbcdll.lbc system os2v2 dll @%append $(OBJS)\odbcdll.lbc system os2v2 dll
wlink @$(OBJS)\odbcdll.lbc wlink @$(OBJS)\odbcdll.lbc
@@ -3477,7 +3493,7 @@ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FL
@%append $(OBJS)\xmldll.lbc option caseexact @%append $(OBJS)\xmldll.lbc option caseexact
@%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME) @%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_3) libpath $(LIBDIRNAME)
@for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) upm32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i
@%append $(OBJS)\xmldll.lbc @%append $(OBJS)\xmldll.lbc
@%append $(OBJS)\xmldll.lbc system os2v2 dll @%append $(OBJS)\xmldll.lbc system os2v2 dll
wlink @$(OBJS)\xmldll.lbc wlink @$(OBJS)\xmldll.lbc
@@ -5038,6 +5054,11 @@ $(OBJS)\monodll_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monodll_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monodll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp $(OBJS)\monodll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5498,6 +5519,11 @@ $(OBJS)\monodll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monodll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp $(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6679,6 +6705,11 @@ $(OBJS)\monolib_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monolib_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monolib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp $(OBJS)\monolib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7139,6 +7170,11 @@ $(OBJS)\monolib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\monolib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp $(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -8335,6 +8371,11 @@ $(OBJS)\coredll_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\coredll_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\coredll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp $(OBJS)\coredll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -9424,6 +9465,11 @@ $(OBJS)\corelib_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1
$(OBJS)\corelib_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\corelib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp $(OBJS)\corelib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -9882,6 +9928,9 @@ $(OBJS)\corelib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp
$(OBJS)\advdll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp $(OBJS)\advdll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp $(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -9945,6 +9994,9 @@ $(OBJS)\advdll_sound.obj : .AUTODEPEND ..\..\src\os2\sound.cpp
$(OBJS)\advlib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp $(OBJS)\advlib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp $(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(CXX) -bt=os2 -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<

2
include/wx/os2/colour.h
View File

@@ -22,7 +22,7 @@ public:
// ------------ // ------------
// default // default
wxColour() { Init(); } wxColour();
DEFINE_STD_WXCOLOUR_CONSTRUCTORS DEFINE_STD_WXCOLOUR_CONSTRUCTORS
// Copy ctors and assignment operators // Copy ctors and assignment operators

3
src/common/colourcmn.cpp
View File

@@ -19,6 +19,9 @@
#include "wx/colour.h" #include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/log.h"
// ============================================================================ // ============================================================================

39
src/os2/colour.cpp
View File

@@ -22,7 +22,7 @@
#define INCL_PM #define INCL_PM
#include<os2.h> #include<os2.h>
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)
// Colour // Colour
@@ -38,25 +38,12 @@ wxColour::wxColour ()
Init(); Init();
} // end of wxColour::wxColour } // end of wxColour::wxColour
wxColour::wxColour ( wxColour::wxColour( const wxColour& rCol )
unsigned char cRed
, unsigned char cGreen
, unsigned char cBlue
)
{
Set(cRed, cGreen, cBlue);
} // end of wxColour::wxColour
wxColour::wxColour(
const wxColour& rCol
)
{ {
*this = rCol; *this = rCol;
} // end of wxColour::wxColour } // end of wxColour::wxColour
wxColour& wxColour::operator =( wxColour& wxColour::operator= (const wxColour& rCol)
const wxColour& rCol
)
{ {
m_cRed = rCol.m_cRed; m_cRed = rCol.m_cRed;
m_cGreen = rCol.m_cGreen; m_cGreen = rCol.m_cGreen;
@@ -66,27 +53,13 @@ wxColour& wxColour::operator =(
return *this; return *this;
} // end of wxColour& wxColour::operator = } // end of wxColour& wxColour::operator =
void wxColour::InitFromName(
const wxString& sCol
)
{
if ( wxString2Colour(sCol, this) )
return;
// leave invalid
Init();
} // end of wxColour::InitFromName
wxColour::~wxColour() wxColour::~wxColour()
{ {
} // end of wxColour::~wxColour } // end of wxColour::~wxColour
void wxColour::Set( void wxColour::InitWith( unsigned char cRed,
unsigned char cRed unsigned char cGreen,
, unsigned char cGreen unsigned char cBlue )
, unsigned char cBlue
)
{ {
m_cRed = cRed; m_cRed = cRed;
m_cGreen = cGreen; m_cGreen = cGreen;