correction for Mac OS compilation

[wxWidgets.git] / wxPython / src / cmndlgs.i

diff --git a/wxPython/src/cmndlgs.i b/wxPython/src/cmndlgs.i
index 088e509085cafce9d1f680247ffe85eeb6bd5356..321c4e7ddd3f3043ad529d088dafabcb3d21567c 100644 (file)
--- a/wxPython/src/cmndlgs.i
+++ b/wxPython/src/cmndlgs.i
@@ -36,13 +36,13 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-class wxColourData {
+class wxColourData : public wxObject {

 public:
     wxColourData();
     ~wxColourData();
 
     bool GetChooseFull();
 public:
     wxColourData();
     ~wxColourData();
 
     bool GetChooseFull();

-    wxColour& GetColour();
+    wxColour GetColour();

     wxColour GetCustomColour(int i);
     void SetChooseFull(int flag);
     void SetColour(const wxColour& colour);
     wxColour GetCustomColour(int i);
     void SetChooseFull(int flag);
     void SetColour(const wxColour& colour);


@@ -69,7 +69,7 @@ public:
                 char* message = "Choose a directory",
                 char* defaultPath = "",
                 long style = 0,
                 char* message = "Choose a directory",
                 char* defaultPath = "",
                 long style = 0,

-                const wxPoint& pos = wxPyDefaultPosition);
+                const wxPoint& pos = wxDefaultPosition);

 
     %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
 


@@ -91,7 +91,7 @@ public:
                  char* defaultFile = "",
                  char* wildcard = "*.*",
                  long style = 0,
                  char* defaultFile = "",
                  char* wildcard = "*.*",
                  long style = 0,

-                 const wxPoint& pos = wxPyDefaultPosition);
+                 const wxPoint& pos = wxDefaultPosition);

 
     %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
 


@@ -156,7 +156,7 @@ public:
                              int LCOUNT, wxString* choices,
                              //char** clientData = NULL,
                              long style = wxOK | wxCANCEL | wxCENTRE,
                              int LCOUNT, wxString* choices,
                              //char** clientData = NULL,
                              long style = wxOK | wxCANCEL | wxCENTRE,

-                             wxPoint* pos = &wxPyDefaultPosition) {
+                             wxPoint* pos = &wxDefaultPosition) {

             return new wxSingleChoiceDialog(parent, *message, *caption,
                                             LCOUNT, choices, NULL, style, *pos);
         }
             return new wxSingleChoiceDialog(parent, *message, *caption,
                                             LCOUNT, choices, NULL, style, *pos);
         }


@@ -180,7 +180,7 @@ public:
                       char* caption = "Input Text",
                       char* defaultValue = "",
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       char* caption = "Input Text",
                       char* defaultValue = "",
                       long style = wxOK | wxCANCEL | wxCENTRE,

-                      const wxPoint& pos = wxPyDefaultPosition);
+                      const wxPoint& pos = wxDefaultPosition);

 
     %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
 


@@ -191,14 +191,14 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-class wxFontData {
+class wxFontData : public wxObject {

 public:
     wxFontData();
     ~wxFontData();
 
     void EnableEffects(bool enable);
     bool GetAllowSymbols();
 public:
     wxFontData();
     ~wxFontData();
 
     void EnableEffects(bool enable);
     bool GetAllowSymbols();

-    wxColour& GetColour();
+    wxColour GetColour();

     wxFont GetChosenFont();
     bool GetEnableEffects();
     wxFont GetInitialFont();
     wxFont GetChosenFont();
     bool GetEnableEffects();
     wxFont GetInitialFont();


@@ -231,7 +231,7 @@ public:
                     char* message,
                     char* caption = "Message box",
                     long style = wxOK | wxCANCEL | wxCENTRE,
                     char* message,
                     char* caption = "Message box",
                     long style = wxOK | wxCANCEL | wxCENTRE,

-                    const wxPoint& pos = wxPyDefaultPosition);
+                    const wxPoint& pos = wxDefaultPosition);

 
     %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"