Wrap <commdlgs.h> as <commctls.h>. Required makefiles rebuilded.

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

diff --git a/Makefile.in b/Makefile.in
index 9110fb0b6b0b4bb637a1ab0dc43c14e6da5d235a..97b98f0724c2068c2c88c2be0b92a905edb9620b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1348,6 +1348,7 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
        wx/msw/stackwalk.h \
        wx/msw/winundef.h \
        wx/msw/wrapcctl.h \
+       wx/msw/wrapcdlg.h \
        wx/msw/wrapwin.h \
        $(BASE_WINCE_HDR)
 @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR)

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 303084e59eb85ec8d7bd088ad0902a15eded3148..9128cf3b6629457093125b0c2a1e97e300ee320f 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -116,6 +116,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/stackwalk.h
     wx/msw/winundef.h
     wx/msw/wrapcctl.h
+    wx/msw/wrapcdlg.h
     wx/msw/wrapwin.h
 </set>
 <set var="BASE_WINCE_HDR" hints="files">

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index a8818d1dde49edb777dff73c28509c3861445ae2..dc368a9c9bf8d9d7dafe5657c2cea9d7f827b95a 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -1053,6 +1053,10 @@ SOURCE=..\..\include\wx\msw\wrapcctl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\wrapcdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\wrapwin.h
 # End Source File
 # End Group

diff --git a/include/wx/msw/wrapcdlg.h b/include/wx/msw/wrapcdlg.h
new file mode 100644 (file)
index 0000000..5e87f27
--- /dev/null
+++ b/include/wx/msw/wrapcdlg.h
@@ -0,0 +1,26 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/wrapcdlg.h
+// Purpose:     Wrapper for the standard <commdlg.h> header
+// Author:      Wlodzimierz ABX Skiba
+// Modified by:
+// Created:     22.03.2005
+// RCS-ID:      $Id$
+// Copyright:   (c) 2005 Wlodzimierz Skiba
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_WRAPCDLG_H_
+#define _WX_MSW_WRAPCDLG_H_
+
+#include "wx/defs.h"
+
+#include "wx/msw/wrapwin.h"
+#include "wx/msw/private.h"
+#include "wx/msw/missing.h"
+
+#if wxUSE_COMMON_DIALOGS && !defined(__SMARTPHONE__) && !defined(__WXMICROWIN__)
+    #include <commdlg.h>
+#endif
+
+#endif // _WX_MSW_WRAPCDLG_H_
+

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 9c34396f4f53073fa0a23e2f09010d492366682a..d2d1fee292d83af4c16c55411cd8509cbf7961a8 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -50,17 +50,7 @@
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 #if defined(__WXMSW__)
-    #include <windowsx.h>
-    #include "wx/msw/private.h"
-
-    #ifndef __SMARTPHONE__ /* of WinCE */
-        #include <commdlg.h>
-    #endif
-
-    #if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
-        #include <windowsx.h>
-        #include <commdlg.h>
-    #endif
+    #include "wx/msw/wrapcdlg.h"
 #endif // MSW
 
     #if wxUSE_PRINTING_ARCHITECTURE
@@ -187,7 +177,7 @@ wxPrintData::wxPrintData()
 
     m_privData = NULL;
     m_privDataLen = 0;
-    
+
     m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
 }
 
@@ -218,7 +208,7 @@ wxPrintData::~wxPrintData()
     m_nativeData->m_ref--;
     if (m_nativeData->m_ref == 0)
         delete m_nativeData;
-        
+
     if (m_privData)
         delete [] m_privData;
 

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index bad72e6dc2a22f1751d64139be57399d5ceb6d5c..126dcc282f05fe6d7738f171933d90cf338c0dba 100644 (file)
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -38,13 +38,10 @@
 #include <string.h>
 
 #ifdef __WXMSW__
-#include "wx/msw/wrapwin.h"
-#include <commdlg.h>
-
-#ifndef __WIN32__
-#include <print.h>
-#endif
-
+    #include "wx/msw/wrapcdlg.h"
+    #ifndef __WIN32__
+        #include <print.h>
+    #endif
 #endif
  // End __WXMSW__
 

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 6afdf78053e210ea444116ce58edf2661c53645f..5a308b49507600914db4a6085d56a9652291e401 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -59,9 +59,7 @@
 #endif
 
 #ifdef __WXMSW__
-    #include "wx/msw/private.h"
-    #include <commdlg.h>
-
+    #include "wx/msw/wrapcdlg.h"
     #ifndef __WIN32__
         #include <print.h>
     #endif

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index cc836963a9b9a775f7d7aee8cd917c2b4d5511a2..18705d6d085a6d04d3667b271dff0a9d2a46a950 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -48,10 +48,7 @@
 #include "wx/colordlg.h"
 #include "wx/cmndata.h"
 #include "wx/math.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
+#include "wx/msw/wrapcdlg.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index a56e537832397cfc705663b946a489beed0f7f88..df9046419a4cecf948aa8e72a295550f34948a12 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -41,9 +41,6 @@
     #include "wx/icon.h"
 #endif
 
-#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
-#include "wx/msw/missing.h" // needs to be before #include <commdlg.h>
-
 #include "wx/sysopt.h"
 #include "wx/dcprint.h"
 #include "wx/module.h"
@@ -55,10 +52,7 @@
 
 #include <string.h>
 
-#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
-    #include <commdlg.h>
-#endif
-
+#include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
     #include <print.h>
 #endif

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 8636a4447cc6610dd5f94999428a0f41c8568adc..bbfd69e35880025e06e989ff08d2345f8797dffb 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -48,10 +48,7 @@
 #include "wx/msw/printdlg.h"
 #include "wx/math.h"
 
-#if wxUSE_COMMON_DIALOGS
-    #include <commdlg.h>
-#endif
-
+#include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
     #include <print.h>
 #endif

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 33f2cbf86f4abd4499a8a0c085ef75dca99db29c..cda785f0b35dcbac0ad8a848832a426ba6393f20 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -43,9 +43,7 @@
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
-#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
-    #include <commdlg.h>
-#endif
+#include "wx/msw/wrapcdlg.h"
 
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     #include "wx/msw/wince/resources.h"
@@ -463,7 +461,7 @@ bool wxDialog::DoOK()
         event.SetEventObject(this);
 
         return GetEventHandler()->ProcessEvent(event);
-    }    
+    }
 }
 #endif
 
@@ -484,7 +482,7 @@ wxToolBar *wxDialog::OnCreateToolBar(long style,
     return new wxToolMenuBar(this, winid,
                          wxDefaultPosition, wxDefaultSize,
                          style, name);
-}                                        
+}
 #endif
 
 // ---------------------------------------------------------------------------

diff --git a/src/msw/fdrepdlg.cpp b/src/msw/fdrepdlg.cpp
index 81e37f95dd44c912528f7b8382d5226236d676ab..7eab0dae8d707ea8faeba638a0fe7476de259c7d 100644 (file)
--- a/src/msw/fdrepdlg.cpp
+++ b/src/msw/fdrepdlg.cpp
@@ -35,12 +35,7 @@
     #include "wx/log.h"
 #endif
 
-#include "wx/msw/private.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
-
+#include "wx/msw/wrapcdlg.h"
 #include "wx/fdrepdlg.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 0cde93995b2008440cf78a535547ca56efba7013..abf12be7982ea036afa0cc519a0f160ff98102ef 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -40,11 +40,7 @@
     #include "wx/app.h"
 #endif
 
-#include "wx/msw/private.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
+#include "wx/msw/wrapcdlg.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index fefc22adb6e4dbf888bd25d2505b2e895b42fb95..0ed341667678e80e7d79c76eaf40a0b515ffaa9c 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -37,11 +37,7 @@
 #endif
 
 #include "wx/fontdlg.h"
-#include "wx/msw/private.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-#include <commdlg.h>
-#endif
+#include "wx/msw/wrapcdlg.h"
 
 #include "wx/cmndata.h"
 #include "wx/log.h"

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 6a8457f3c37144c3ccd6ad3d0d04808e4808a7eb..02892c45100bbaeae8049e8391bbf4bacb1abdfd 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -44,9 +44,7 @@
 
 #include <stdlib.h>
 
-#include "wx/msw/private.h"
-
-#include <commdlg.h>
+#include "wx/msw/wrapcdlg.h"
 
 #ifndef __WIN32__
     #include <print.h>
@@ -302,7 +300,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
             wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
 
             // Not sure if we should check for this mismatch
-//            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
+//            wxASSERT_MSG( (m_printerName.empty() || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
 
             if (!printerName.empty())
                 data.SetPrinterName( printerName );

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index cd496d3291d7627229183ab42abadcb3336253c8..ba0590e1d074affb565a9777fb6c766940d165af 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -52,10 +52,7 @@
 
 #include <stdlib.h>
 
-#include "wx/msw/private.h"
-
-#include <commdlg.h>
-
+#include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
     #include <print.h>
 #endif

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 2f432a144e9ef41522ec743342c669e163677c73..3050a4741f852f78f0b7754e67b19a82543a987b 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -3651,6 +3651,10 @@ SOURCE=..\include\wx\msw\wrapcctl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\wrapcdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\wrapwin.h
 # End Source File
 # End Group

diff --git a/wxGTK.spec b/wxGTK.spec
index b2df2658278e82aa9f75c0688d2c45e53a96a38a..3285bc6e0a93d448c17b66f48ca84c66c7780bcf 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -276,6 +276,7 @@ wx/msw/mimetype.h
 wx/msw/stackwalk.h
 wx/msw/winundef.h
 wx/msw/wrapcctl.h
+wx/msw/wrapcdlg.h
 wx/msw/wrapwin.h
 wx/fs_inet.h
 wx/gsocket.h

diff --git a/wxMotif.spec b/wxMotif.spec
index 0356921ef924b404dbd503d997e0946801b490ba..f3992b7598d95dda3510b6428834f4e3bb8d7186 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -204,6 +204,7 @@ wx/msw/mimetype.h
 wx/msw/stackwalk.h
 wx/msw/winundef.h
 wx/msw/wrapcctl.h
+wx/msw/wrapcdlg.h
 wx/msw/wrapwin.h
 wx/fs_inet.h
 wx/gsocket.h

diff --git a/wxX11.spec b/wxX11.spec
index 7b49d8f5a6de363f39e5672e26882ee898b2700e..5858533ba8540bc5bfa7b6b4a8daf4ffab109c94 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -255,6 +255,7 @@ wx/msw/mimetype.h
 wx/msw/stackwalk.h
 wx/msw/winundef.h
 wx/msw/wrapcctl.h
+wx/msw/wrapcdlg.h
 wx/msw/wrapwin.h
 wx/fs_inet.h
 wx/gsocket.h