more warning fixes about empty if statement in helper classes in release build

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

diff --git a/wxPython/src/_mdi.i b/wxPython/src/_mdi.i
index 1ccaa7a1779e15f7a325817576bfc9f4f685d946..9264b8538947c5e2892bc9024033abef9cae33dc 100644 (file)
--- a/wxPython/src/_mdi.i
+++ b/wxPython/src/_mdi.i
@@ -28,28 +28,31 @@
 #define IDM_WINDOWICONS         4003
 #define IDM_WINDOWNEXT          4004
 #define IDM_WINDOWTILEVERT      4005
 #define IDM_WINDOWICONS         4003
 #define IDM_WINDOWNEXT          4004
 #define IDM_WINDOWTILEVERT      4005

+#define IDM_WINDOWPREV          4006

 #define wxFIRST_MDI_CHILD       4100
 #define wxLAST_MDI_CHILD        4600
 
 
 
 #define wxFIRST_MDI_CHILD       4100
 #define wxLAST_MDI_CHILD        4600
 
 
 

+MustHaveApp(wxMDIParentFrame);
+

 class wxMDIParentFrame : public wxFrame {
 public:
 class wxMDIParentFrame : public wxFrame {
 public:

-    %addtofunc wxMDIParentFrame         "self._setOORInfo(self)"
-    %addtofunc wxMDIParentFrame()       ""
+    %pythonAppend wxMDIParentFrame         "self._setOORInfo(self)"
+    %pythonAppend wxMDIParentFrame()       ""

 
     wxMDIParentFrame(wxWindow *parent,
 
     wxMDIParentFrame(wxWindow *parent,

-                     const wxWindowID id,
-                     const wxString& title,
+                     const wxWindowID id=-1,
+                     const wxString& title = wxPyEmptyString,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxPyFrameNameStr);
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxPyFrameNameStr);

-    %name(PreMDIParentFrame)wxMDIParentFrame();
+    %RenameCtor(PreMDIParentFrame, wxMDIParentFrame());

 
     bool Create(wxWindow *parent,
 
     bool Create(wxWindow *parent,

-                     const wxWindowID id,
-                     const wxString& title,
+                     const wxWindowID id=-1,
+                     const wxString& title = wxPyEmptyString,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,


@@ -73,35 +76,41 @@ public:
     void SetWindowMenu(wxMenu* menu);
     void SetToolBar(wxToolBar* toolbar);
 #endif
     void SetWindowMenu(wxMenu* menu);
     void SetToolBar(wxToolBar* toolbar);
 #endif

-    void Tile();
+    void Tile(wxOrientation orient = wxHORIZONTAL);

 };
 
 //---------------------------------------------------------------------------
 
 };
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxMDIChildFrame);
+

 class wxMDIChildFrame : public wxFrame {
 public:
 class wxMDIChildFrame : public wxFrame {
 public:

-    %addtofunc wxMDIChildFrame         "self._setOORInfo(self)"
-    %addtofunc wxMDIChildFrame()       ""
+    %pythonAppend wxMDIChildFrame         "self._setOORInfo(self)"
+    %pythonAppend wxMDIChildFrame()       ""
+    %typemap(out) wxMDIChildFrame*;    // turn off this typemap

 
     wxMDIChildFrame(wxMDIParentFrame* parent,
 
     wxMDIChildFrame(wxMDIParentFrame* parent,

-                    const wxWindowID id,
-                    const wxString& title,
+                    const wxWindowID id=-1,
+                    const wxString& title = wxPyEmptyString,

                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxPyFrameNameStr);
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxPyFrameNameStr);

-    %name(PreMDIChildFrame)wxMDIChildFrame();
+    %RenameCtor(PreMDIChildFrame, wxMDIChildFrame());
+
+    // Turn it back on again
+    %typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, $owner); }

 
     bool Create(wxMDIParentFrame* parent,
 
     bool Create(wxMDIParentFrame* parent,

-                    const wxWindowID id,
-                    const wxString& title,
+                    const wxWindowID id=-1,
+                    const wxString& title = wxPyEmptyString,

                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxPyFrameNameStr);
 
     void Activate();
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxPyFrameNameStr);
 
     void Activate();

-    void Maximize(bool maximize);
+    void Maximize(bool maximize=true);

     void Restore();
 
 };
     void Restore();
 
 };


@@ -109,13 +118,19 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxMDIClientWindow);
+

 class wxMDIClientWindow : public wxWindow {
 public:
 class wxMDIClientWindow : public wxWindow {
 public:

-    %addtofunc wxMDIClientWindow         "self._setOORInfo(self)"
-    %addtofunc wxMDIClientWindow()       ""
+    %pythonAppend wxMDIClientWindow         "self._setOORInfo(self)"
+    %pythonAppend wxMDIClientWindow()       ""
+    %typemap(out) wxMDIClientWindow*;    // turn off this typemap

 
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
 
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);

-    %name(PreMDIClientWindow)wxMDIClientWindow();
+    %RenameCtor(PreMDIClientWindow, wxMDIClientWindow());
+
+    // Turn it back on again
+    %typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, $owner); }

 
     bool Create(wxMDIParentFrame* parent, long style = 0);
 };
 
     bool Create(wxMDIParentFrame* parent, long style = 0);
 };