blind attempt to fix wxMac compilation (__UNIX__ defined on OS X?)

[wxWidgets.git] / include / wx / generic / prntdlgg.h

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index f687fb38b6279cece492942275da57738be0135c..d0114adf29bc80b47db4792a6e9f169d1e606141 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -13,7 +13,7 @@
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "prntdlgg.h"
 #endif
 
     #pragma interface "prntdlgg.h"
 #endif
 


@@ -160,7 +160,8 @@ private:
 class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog
 {
 public:
 class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog
 {
 public:

-    wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = (wxPageSetupData*) NULL);
+    wxGenericPageSetupDialog(wxWindow *parent = NULL,
+                             wxPageSetupData* data = NULL);

     virtual ~wxGenericPageSetupDialog();
 
     virtual bool TransferDataFromWindow();
     virtual ~wxGenericPageSetupDialog();
 
     virtual bool TransferDataFromWindow();


@@ -186,7 +187,7 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-    DECLARE_CLASS(wxGenericPageSetupDialog)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericPageSetupDialog)

 };
 
 #endif
 };
 
 #endif