Add generic dialogs in non wxUniversal builds. Regenerated makefiles.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/dialogs/Makefile.in

@@ -43,6 +43,7 @@ DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 DIALOGS_OBJECTS =  \
 	$(__dialogs_os2_lib_res) \
 	dialogs_dialogs.o \
+	$(__GENERIC_FILES_OBJECTS) \
 	$(__dialogs___win32rc)
 
 ### Conditionally set variables: ###
@@ -76,6 +77,12 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \
 @COND_TOOLKIT_COCOA@	dialogs.app/Contents/PkgInfo
 @COND_TOOLKIT_MAC@____dialogs_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@	dialogs.app/Contents/PkgInfo
+@COND_TOOLKIT_MSW_WXUNIV_0@__GENERIC_FILES_OBJECTS \
+@COND_TOOLKIT_MSW_WXUNIV_0@	= dialogs_colrdlgg.o dialogs_dirdlgg.o \
+@COND_TOOLKIT_MSW_WXUNIV_0@	dialogs_fontdlgg.o
+@COND_TOOLKIT_MAC_WXUNIV_0@__GENERIC_FILES_OBJECTS \
+@COND_TOOLKIT_MAC_WXUNIV_0@	= dialogs_colrdlgg.o dialogs_dirdlgg.o
+@COND_TOOLKIT_PM_WXUNIV_0@__GENERIC_FILES_OBJECTS = dialogs_fontdlgg.o
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -171,6 +178,24 @@ data:
 dialogs_dialogs.o: $(srcdir)/dialogs.cpp
 	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
 
+@COND_TOOLKIT_MSW_WXUNIV_0@dialogs_colrdlgg.o: $(srcdir)/../../src/generic/colrdlgg.cpp
+@COND_TOOLKIT_MSW_WXUNIV_0@	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_WXUNIV_0@dialogs_colrdlgg.o: $(srcdir)/../../src/generic/colrdlgg.cpp
+@COND_TOOLKIT_MAC_WXUNIV_0@	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_WXUNIV_0@dialogs_dirdlgg.o: $(srcdir)/../../src/generic/dirdlgg.cpp
+@COND_TOOLKIT_MSW_WXUNIV_0@	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_WXUNIV_0@dialogs_dirdlgg.o: $(srcdir)/../../src/generic/dirdlgg.cpp
+@COND_TOOLKIT_MAC_WXUNIV_0@	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_WXUNIV_0@	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
+@COND_TOOLKIT_PM_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp
+@COND_TOOLKIT_PM_WXUNIV_0@	$(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
 dialogs_dialogs_rc.o: $(srcdir)/dialogs.rc
 	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
 

samples/dialogs/dialogs.bkl

@@ -3,8 +3,26 @@
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
+    <set var="GENERIC_FILES">
+        <if cond="TOOLKIT=='MSW' and WXUNIV=='0'">
+            ../../src/generic/colrdlgg.cpp
+            ../../src/generic/dirdlgg.cpp
+            ../../src/generic/fontdlgg.cpp
+        </if>
+        <if cond="TOOLKIT=='MAC' and WXUNIV=='0'">
+            ../../src/generic/colrdlgg.cpp
+            ../../src/generic/dirdlgg.cpp
+        </if>
+        <if cond="TOOLKIT=='PM' and WXUNIV=='0'">
+            ../../src/generic/fontdlgg.cpp
+        </if>
+    </set>
+
     <exe id="dialogs" template="wx_sample" template_append="wx_append">
-        <sources>dialogs.cpp</sources>
+        <sources>
+            dialogs.cpp
+            $(GENERIC_FILES)
+        </sources>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>

samples/dialogs/dialogs.dsp

@@ -468,11 +468,200 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\..\..\src\generic\colrdlgg.cpp
+
+!IF  "$(CFG)" == "dialogs - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Debug"
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\dialogs.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=.\dialogs.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\..\..\src\generic\dirdlgg.cpp
+
+!IF  "$(CFG)" == "dialogs - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Debug"
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\..\..\src\generic\fontdlgg.cpp
+
+!IF  "$(CFG)" == "dialogs - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "dialogs - Win32 Debug"
+
+
+!ENDIF
+
 # End Source File
 # End Group
 # End Target

samples/dialogs/dialogs.h

@@ -15,7 +15,7 @@
 #define USE_COLOURDLG_GENERIC                                                     \
     (                                                                             \
         wxUSE_COLOURDLG &&                                                        \
-        ( defined(__WXMSW__) || defined(__WXMAC__) ) &&   \
+        ( defined(__WXMSW__) || defined(__WXMAC__) ) &&                           \
         !defined(__WXUNIVERSAL__)                                                 \
     )
 
@@ -23,11 +23,17 @@
 #define USE_FONTDLG_GENERIC                                                       \
     (                                                                             \
         wxUSE_FONTDLG &&                                                          \
-        ( defined(__WXMSW__) || defined(__WXPM__) ) &&      \
+        ( defined(__WXMSW__) || defined(__WXPM__) ) &&                            \
+        !defined(__WXUNIVERSAL__)                                                 \
+    )
+
+#define USE_DIRDLG_GENERIC                                                        \
+    (                                                                             \
+        wxUSE_DIRDLG &&                                                           \
+        ( defined(__WXMSW__) || defined(__WXMAC__) ) &&                           \
         !defined(__WXUNIVERSAL__)                                                 \
     )
 
-#define USE_DIRDLG_GENERIC       0
 
 #define USE_MODAL_PRESENTATION   1
 

samples/dialogs/makefile.bcc

@@ -30,7 +30,8 @@ DIALOGS_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
 	-I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  \
-	$(OBJS)\dialogs_dialogs.obj
+	$(OBJS)\dialogs_dialogs.obj \
+	$(____GENERIC_FILES_FILENAMES_OBJECTS)
 
 ### Conditionally set variables: ###
 
@@ -103,6 +104,12 @@ __DLLFLAG_p = -DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = -dWXUSINGDLL
 !endif
+!if "$(WXUNIV)" == "0"
+____GENERIC_FILES_FILENAMES_OBJECTS =  \
+	$(OBJS)\dialogs_colrdlgg.obj \
+	$(OBJS)\dialogs_dirdlgg.obj \
+	$(OBJS)\dialogs_fontdlgg.obj
+!endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
@@ -180,5 +187,14 @@ data:
 $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
 	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
 
+$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
+
+$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
+
+$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
+
 $(OBJS)\dialogs_dialogs.res: .\dialogs.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**

samples/dialogs/makefile.gcc

@@ -23,6 +23,7 @@ DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
 	$(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  \
 	$(OBJS)\dialogs_dialogs.o \
+	$(____GENERIC_FILES_FILENAMES_OBJECTS) \
 	$(OBJS)\dialogs_dialogs_rc.o
 
 ### Conditionally set variables: ###
@@ -105,6 +106,12 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
+ifeq ($(WXUNIV),0)
+____GENERIC_FILES_FILENAMES_OBJECTS =  \
+	$(OBJS)\dialogs_colrdlgg.o \
+	$(OBJS)\dialogs_dirdlgg.o \
+	$(OBJS)\dialogs_fontdlgg.o
+endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_ADV_p = \
 	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv
@@ -178,6 +185,15 @@ data:
 $(OBJS)\dialogs_dialogs.o: ./dialogs.cpp
 	$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $<
 
+$(OBJS)\dialogs_colrdlgg.o: ./../../src/generic/colrdlgg.cpp
+	$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_dirdlgg.o: ./../../src/generic/dirdlgg.cpp
+	$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp
+	$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+
 $(OBJS)\dialogs_dialogs_rc.o: ./dialogs.rc
 	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
 

samples/dialogs/makefile.vc

@@ -24,6 +24,7 @@ DIALOGS_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
 	$(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  \
 	$(OBJS)\dialogs_dialogs.obj \
+	$(____GENERIC_FILES_FILENAMES_OBJECTS) \
 	$(OBJS)\dialogs_dialogs.res
 
 ### Conditionally set variables: ###
@@ -202,6 +203,12 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
+!if "$(WXUNIV)" == "0"
+____GENERIC_FILES_FILENAMES_OBJECTS =  \
+	$(OBJS)\dialogs_colrdlgg.obj \
+	$(OBJS)\dialogs_dirdlgg.obj \
+	$(OBJS)\dialogs_fontdlgg.obj
+!endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
@@ -264,5 +271,14 @@ data:
 $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) $**
 
+$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) $**
+
+$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) $**
+
+$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) $**
+
 $(OBJS)\dialogs_dialogs.res: .\dialogs.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**

samples/dialogs/makefile.wat

@@ -110,6 +110,13 @@ __EXCEPTIONSFLAG_7 =
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG_7 = -xs
 !endif
+____GENERIC_FILES_FILENAMES_OBJECTS =
+!ifeq WXUNIV 0
+____GENERIC_FILES_FILENAMES_OBJECTS =  &
+	$(OBJS)\dialogs_colrdlgg.obj &
+	$(OBJS)\dialogs_dirdlgg.obj &
+	$(OBJS)\dialogs_fontdlgg.obj
+!endif
 __WXLIB_ADV_p =
 !ifeq MONOLITHIC 0
 __WXLIB_ADV_p = &
@@ -181,7 +188,8 @@ DIALOGS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5)
 	-i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples &
 	$(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  &
-	$(OBJS)\dialogs_dialogs.obj
+	$(OBJS)\dialogs_dialogs.obj &
+	$(____GENERIC_FILES_FILENAMES_OBJECTS)
 
 
 all : $(OBJS)
@@ -217,5 +225,14 @@ data : .SYMBOLIC
 $(OBJS)\dialogs_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
 	$(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
 
+$(OBJS)\dialogs_colrdlgg.obj :  .AUTODEPEND .\..\..\src\generic\colrdlgg.cpp
+	$(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_dirdlgg.obj :  .AUTODEPEND .\..\..\src\generic\dirdlgg.cpp
+	$(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_fontdlgg.obj :  .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp
+	$(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
 $(OBJS)\dialogs_dialogs.res :  .AUTODEPEND .\dialogs.rc
 	wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<