added XRC handler for wxStdDialogButtonSizer

[wxWidgets.git] / src / common / cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 9c34396f4f53073fa0a23e2f09010d492366682a..b0bc37a2fbd747e7de40f61da4f8e96c2810aeb8 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();
 }
 
@@ -195,6 +185,7 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
     : wxObject()
 {
     m_nativeData = NULL;
+    m_privData = NULL;
     (*this) = printData;
 }
 
@@ -218,7 +209,7 @@ wxPrintData::~wxPrintData()
     m_nativeData->m_ref--;
     if (m_nativeData->m_ref == 0)
         delete m_nativeData;
-        
+
     if (m_privData)
         delete [] m_privData;