corrected thread detection for Darwin / Mac OS X

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

diff --git a/wxPython/src/mdi.i b/wxPython/src/mdi.i
index 21b4336e5e64c1699b59e4942a58c4559c44f9f5..7c17fcea7183ebcb60ec77d2d72292528466a8ee 100644 (file)
--- a/wxPython/src/mdi.i
+++ b/wxPython/src/mdi.i
@@ -32,6 +32,24 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+%{
+    // Put some wx default wxChar* values into wxStrings.
+    DECLARE_DEF_STRING(FrameNameStr);
+%}
+
+//----------------------------------------------------------------------
+
+const int IDM_WINDOWTILE  = 4001;
+const int IDM_WINDOWTILEHOR  = 4001;
+const int IDM_WINDOWCASCADE = 4002;
+const int IDM_WINDOWICONS = 4003;
+const int IDM_WINDOWNEXT = 4004;
+const int IDM_WINDOWTILEVERT = 4005;
+const int wxFIRST_MDI_CHILD = 4100;
+const int wxLAST_MDI_CHILD = 4600;
+
+
+

 class wxMDIParentFrame : public wxFrame {
 public:
     wxMDIParentFrame(wxWindow *parent,
 class wxMDIParentFrame : public wxFrame {
 public:
     wxMDIParentFrame(wxWindow *parent,


@@ -40,7 +58,7 @@ public:
                      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,

-                     const char* name = "frame");
+                     const wxString& name = wxPyFrameNameStr);

     %name(wxPreMDIParentFrame)wxMDIParentFrame();
 
     bool Create(wxWindow *parent,
     %name(wxPreMDIParentFrame)wxMDIParentFrame();
 
     bool Create(wxWindow *parent,


@@ -49,7 +67,10 @@ public:
                      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,

-                     const char* name = "frame");
+                     const wxString& name = wxPyFrameNameStr);
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreMDIParentFrame:val._setOORInfo(val)"

 
     void ActivateNext();
     void ActivatePrevious();
 
     void ActivateNext();
     void ActivatePrevious();


@@ -81,7 +102,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,

-                    const char* name = "frame");
+                    const wxString& name = wxPyFrameNameStr);

     %name(wxPreMDIChildFrame)wxMDIChildFrame();
 
     bool Create(wxMDIParentFrame* parent,
     %name(wxPreMDIChildFrame)wxMDIChildFrame();
 
     bool Create(wxMDIParentFrame* parent,


@@ -90,8 +111,10 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxDEFAULT_FRAME_STYLE,

-                    const char* name = "frame");
+                    const wxString& name = wxPyFrameNameStr);

 
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreMDIChildFrame:val._setOORInfo(val)"

 
     void Activate();
     void Maximize(bool maximize);
 
     void Activate();
     void Maximize(bool maximize);


@@ -107,13 +130,10 @@ public:
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
     %name(wxPreMDIClientWindow)wxMDIClientWindow();
 
     wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
     %name(wxPreMDIClientWindow)wxMDIClientWindow();
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
-    %pragma(python) addtomethod = "__init__:#wx._StdOnScrollCallbacks(self)"
-

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

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
-    %pragma(python) addtomethod = "__init__:#wx._StdOnScrollCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreMDIClientWindow:val._setOORInfo(val)"

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