Compilation fixes

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

diff --git a/utils/wxPython/src/cmndlgs.i b/utils/wxPython/src/cmndlgs.i
index f4942a4ffb54a234b1b21c3ffb9007bf122f4109..158e2350178e19064f44a2ddc94b30c5fd03d166 100644 (file)
--- a/utils/wxPython/src/cmndlgs.i
+++ b/utils/wxPython/src/cmndlgs.i
@@ -17,7 +17,7 @@
 #include <wx/colordlg.h>
 #include <wx/dirdlg.h>
 #include <wx/fontdlg.h>
 #include <wx/colordlg.h>
 #include <wx/dirdlg.h>
 #include <wx/fontdlg.h>

-#include <wx/printdlg.h>
+#include <wx/progdlg.h>

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -30,6 +30,7 @@
 %import misc.i
 %import gdi.i
 %import windows.i
 %import misc.i
 %import gdi.i
 %import windows.i

+%import frames.i

 
 %pragma(python) code = "import wx"
 
 
 %pragma(python) code = "import wx"
 


@@ -55,18 +56,13 @@ public:
 
     %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
 

-#ifdef __WXMSW__

     wxColourData& GetColourData();
     wxColourData& GetColourData();

-#else
-    wxColourData GetColourData();
-#endif

     int ShowModal();
 };
 
 
 //----------------------------------------------------------------------
 
     int ShowModal();
 };
 
 
 //----------------------------------------------------------------------
 

-#ifdef __WXMSW__

 class wxDirDialog : public wxDialog {
 public:
     wxDirDialog(wxWindow* parent,
 class wxDirDialog : public wxDialog {
 public:
     wxDirDialog(wxWindow* parent,


@@ -84,7 +80,6 @@ public:
     void SetPath(const wxString& path);
     int ShowModal();
 };
     void SetPath(const wxString& path);
     int ShowModal();
 };

-#endif

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -132,12 +127,12 @@ public:
         wxSingleChoiceDialog(wxWindow* parent,
                              wxString* message,
                              wxString* caption,
         wxSingleChoiceDialog(wxWindow* parent,
                              wxString* message,
                              wxString* caption,

-                             int LCOUNT, wxString* LIST,
+                             int LCOUNT, wxString* choices,

                              //char** clientData = NULL,
                              long style = wxOK | wxCANCEL | wxCENTRE,
                              wxPoint* pos = &wxPyDefaultPosition) {
             return new wxSingleChoiceDialog(parent, *message, *caption,
                              //char** clientData = NULL,
                              long style = wxOK | wxCANCEL | wxCENTRE,
                              wxPoint* pos = &wxPyDefaultPosition) {
             return new wxSingleChoiceDialog(parent, *message, *caption,

-                                            LCOUNT, LIST, NULL, style, *pos);
+                                            LCOUNT, choices, NULL, style, *pos);

         }
     }
 
         }
     }
 


@@ -193,7 +188,7 @@ public:
 
 class wxFontDialog : public wxDialog {
 public:
 
 class wxFontDialog : public wxDialog {
 public:

-    wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
+    wxFontDialog(wxWindow* parent, wxFontData* data);

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


@@ -202,94 +197,6 @@ public:
 };
 
 
 };
 
 

-//----------------------------------------------------------------------
-
-class wxPageSetupData {
-public:
-    wxPageSetupData();
-    ~wxPageSetupData();
-
-    void EnableHelp(bool flag);
-    void EnableMargins(bool flag);
-    void EnableOrientation(bool flag);
-    void EnablePaper(bool flag);
-    void EnablePrinter(bool flag);
-    wxPoint GetPaperSize();
-    wxPoint GetMarginTopLeft();
-    wxPoint GetMarginBottomRight();
-    wxPoint GetMinMarginTopLeft();
-    wxPoint GetMinMarginBottomRight();
-    int GetOrientation();
-    bool GetDefaultMinMargins();
-    bool GetEnableMargins();
-    bool GetEnableOrientation();
-    bool GetEnablePaper();
-    bool GetEnablePrinter();
-    bool GetEnableHelp();
-    bool GetDefaultInfo();
-    void SetPaperSize(const wxPoint& size);
-    void SetMarginTopLeft(const wxPoint& pt);
-    void SetMarginBottomRight(const wxPoint& pt);
-    void SetMinMarginTopLeft(const wxPoint& pt);
-    void SetMinMarginBottomRight(const wxPoint& pt);
-    void SetOrientation(int orientation);
-    void SetDefaultMinMargins(bool flag);
-    void SetDefaultInfo(bool flag);
-};
-
-
-class wxPageSetupDialog : public wxDialog {
-public:
-    wxPageSetupDialog(wxWindow* parent, wxPageSetupData* data = NULL);
-
-    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
-
-    wxPageSetupData& GetPageSetupData();
-    int ShowModal();
-};
-
-//----------------------------------------------------------------------
-
-class wxPrintData {
-public:
-    wxPrintData();
-    ~wxPrintData();
-
-    void EnableHelp(bool flag);
-    void EnablePageNumbers(bool flag);
-    void EnablePrintToFile(bool flag);
-    void EnableSelection(bool flag);
-    bool GetAllPages();
-    bool GetCollate();
-    int GetFromPage();
-    int GetMaxPage();
-    int GetMinPage();
-    int GetNoCopies();
-    int GetOrientation();
-    int GetToPage();
-    void SetCollate(bool flag);
-    void SetFromPage(int page);
-    void SetMaxPage(int page);
-    void SetMinPage(int page);
-    void SetOrientation(int orientation);
-    void SetNoCopies(int n);
-    void SetPrintToFile(bool flag);
-    void SetSetupDialog(bool flag);
-    void SetToPage(int page);
-};
-
-
-class wxPrintDialog : public wxDialog {
-public:
-    wxPrintDialog(wxWindow* parent, wxPrintData* data = NULL);
-
-    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
-
-    wxPrintData& GetPrintData();
-    %new wxDC* GetPrintDC();
-    int ShowModal();
-};
-

 //----------------------------------------------------------------------
 
 class wxMessageDialog : public wxDialog {
 //----------------------------------------------------------------------
 
 class wxMessageDialog : public wxDialog {


@@ -307,56 +214,17 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+class wxProgressDialog : public wxFrame {
+public:
+    wxProgressDialog(const wxString& title,
+                     const wxString& message,
+                     int maximum = 100,
+                     wxWindow* parent = NULL,
+                     int style = wxPD_AUTO_HIDE | wxPD_APP_MODAL );

 
 

-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.7  1998/12/15 20:41:14  RD
-// Changed the import semantics from "from wxPython import *" to "from
-// wxPython.wx import *"  This is for people who are worried about
-// namespace pollution, they can use "from wxPython import wx" and then
-// prefix all the wxPython identifiers with "wx."
-//
-// Added wxTaskbarIcon for wxMSW.
-//
-// Made the events work for wxGrid.
-//
-// Added wxConfig.
-//
-// Added wxMiniFrame for wxGTK, (untested.)
-//
-// Changed many of the args and return values that were pointers to gdi
-// objects to references to reflect changes in the wxWindows API.
-//
-// Other assorted fixes and additions.
-//
-// Revision 1.6  1998/11/25 08:45:22  RD
-//
-// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
-// Added events for wxGrid
-// Other various fixes and additions
-//
-// Revision 1.5  1998/11/15 23:03:43  RD
-// Removing some ifdef's for wxGTK
-//
-// Revision 1.4  1998/10/02 06:40:34  RD
-//
-// Version 0.4 of wxPython for MSW.
-//
-// Revision 1.3  1998/08/18 19:48:13  RD
-// more wxGTK compatibility things.
-//
-// It builds now but there are serious runtime problems...
-//
-// Revision 1.2  1998/08/15 07:36:25  RD
-// - Moved the header in the .i files out of the code that gets put into
-// the .cpp files.  It caused CVS conflicts because of the RCS ID being
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.1  1998/08/09 08:25:49  RD
-// Initial version
-//
-//

 
 

+    bool Update(int value = -1, const char* newmsg = NULL);
+    void Resume();
+}
+
+//----------------------------------------------------------------------