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

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)

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">

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

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_
+

src/common/cmndata.cpp

@@ -50,17 +50,7 @@
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 #if defined(__WXMSW__)
-    #include <windowsx.h>
+    #include "wx/msw/wrapcdlg.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
 #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;
 

src/common/paper.cpp

@@ -38,13 +38,10 @@
 #include <string.h>
 
 #ifdef __WXMSW__
-#include "wx/msw/wrapwin.h"
+    #include "wx/msw/wrapcdlg.h"
-#include <commdlg.h>
+    #ifndef __WIN32__
-
+        #include <print.h>
-#ifndef __WIN32__
+    #endif
-#include <print.h>
-#endif
-
 #endif
  // End __WXMSW__
 

src/common/prntbase.cpp

@@ -59,9 +59,7 @@
 #endif
 
 #ifdef __WXMSW__
-    #include "wx/msw/private.h"
+    #include "wx/msw/wrapcdlg.h"
-    #include <commdlg.h>
-
     #ifndef __WIN32__
         #include <print.h>
     #endif

src/msw/colordlg.cpp

@@ -48,10 +48,7 @@
 #include "wx/colordlg.h"
 #include "wx/cmndata.h"
 #include "wx/math.h"
-
+#include "wx/msw/wrapcdlg.h"
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>

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 "wx/msw/wrapcdlg.h"
-    #include <commdlg.h>
-#endif
-
 #ifndef __WIN32__
     #include <print.h>
 #endif

src/msw/dcprint.cpp

@@ -48,10 +48,7 @@
 #include "wx/msw/printdlg.h"
 #include "wx/math.h"
 
-#if wxUSE_COMMON_DIALOGS
+#include "wx/msw/wrapcdlg.h"
-    #include <commdlg.h>
-#endif
-
 #ifndef __WIN32__
     #include <print.h>
 #endif

src/msw/dialog.cpp

@@ -43,9 +43,7 @@
 #include "wx/evtloop.h"
 #include "wx/ptr_scpd.h"
 
-#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
+#include "wx/msw/wrapcdlg.h"
-    #include <commdlg.h>
-#endif
 
 #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
 
 // ---------------------------------------------------------------------------

src/msw/fdrepdlg.cpp

@@ -35,12 +35,7 @@
     #include "wx/log.h"
 #endif
 
-#include "wx/msw/private.h"
+#include "wx/msw/wrapcdlg.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
-
 #include "wx/fdrepdlg.h"
 
 // ----------------------------------------------------------------------------

src/msw/filedlg.cpp

@@ -40,11 +40,7 @@
     #include "wx/app.h"
 #endif
 
-#include "wx/msw/private.h"
+#include "wx/msw/wrapcdlg.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>

src/msw/fontdlg.cpp

@@ -37,11 +37,7 @@
 #endif
 
 #include "wx/fontdlg.h"
-#include "wx/msw/private.h"
+#include "wx/msw/wrapcdlg.h"
-
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-#include <commdlg.h>
-#endif
 
 #include "wx/cmndata.h"
 #include "wx/log.h"

src/msw/printdlg.cpp

@@ -44,9 +44,7 @@
 
 #include <stdlib.h>
 
-#include "wx/msw/private.h"
+#include "wx/msw/wrapcdlg.h"
-
-#include <commdlg.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 );

src/msw/printwin.cpp

@@ -52,10 +52,7 @@
 
 #include <stdlib.h>
 
-#include "wx/msw/private.h"
+#include "wx/msw/wrapcdlg.h"
-
-#include <commdlg.h>
-
 #ifndef __WIN32__
     #include <print.h>
 #endif

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

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

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

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