added a test to check how exception handling works with Win32 SEH; corrected copyright

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

diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 52bfd7bf62a3fc9b96476c89c90ea215fdb55c7a..4032625afe2662a5bf8c6e1710ff38d3a2d4dea1 100644 (file)
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -49,12 +49,13 @@ enum
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,
     wxFRAME_SHAPED,
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,
     wxFRAME_SHAPED,

-
+    wxFRAME_DRAWER,
+    

     // Obsolete
     // Obsolete

-    //wxDIALOG_MODAL,
-    //wxDIALOG_MODELESS,
-    //wxUSER_COLOURS,
-    //wxNO_3D,
+    wxDIALOG_MODAL,
+    wxDIALOG_MODELESS,
+    wxUSER_COLOURS,
+    wxNO_3D,

 };    
 
 enum
 };    
 
 enum


@@ -69,18 +70,12 @@ enum
     wxTOPLEVEL_EX_DIALOG,
 };
 
     wxTOPLEVEL_EX_DIALOG,
 };
 

-
-
-%typemap(in) (int widths, int* widths_field) {
-    $1 = PyList_Size($input);
-    $2 =  int_LIST_helper($input);
-    if ($2 == NULL) SWIG_fail;
-}
-
-%typemap(freearg) (int widths, int* widths_field) {
-    if ($2) delete [] $2;
-}
-
+// Styles for RequestUserAttention
+enum
+{
+    wxUSER_ATTENTION_INFO = 1,
+    wxUSER_ATTENTION_ERROR = 2
+};

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


@@ -91,13 +86,13 @@ public:
     // No constructor as it can not be used directly from Python
 
     // maximize = True => maximize, otherwise - restore
     // No constructor as it can not be used directly from Python
 
     // maximize = True => maximize, otherwise - restore

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

 
     // undo Maximize() or Iconize()
     virtual void Restore();
 
     // iconize = True => iconize, otherwise - restore
 
     // undo Maximize() or Iconize()
     virtual void Restore();
 
     // iconize = True => iconize, otherwise - restore

-    virtual void Iconize(bool iconize = True);
+    virtual void Iconize(bool iconize = true);

 
     // return True if the frame is maximized
     virtual bool IsMaximized() const;
 
     // return True if the frame is maximized
     virtual bool IsMaximized() const;


@@ -128,9 +123,23 @@ public:
     // is successful.)
     virtual bool SetShape(const wxRegion& region);
 
     // is successful.)
     virtual bool SetShape(const wxRegion& region);
 

+
+    // Attracts the users attention to this window if the application is
+    // inactive (should be called when a background event occurs)
+    virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
+
+    // Is this the active frame (highlighted in the taskbar)?
+    virtual bool IsActive();
+    

 #ifdef __WXMAC__
     void MacSetMetalAppearance( bool on ) ;
     bool MacGetMetalAppearance() const ;
 #ifdef __WXMAC__
     void MacSetMetalAppearance( bool on ) ;
     bool MacGetMetalAppearance() const ;

+#else
+    %extend {
+        // TODO: Should they raise not implemented or just NOP???
+        void MacSetMetalAppearance( bool on ) { /*wxPyRaiseNotImplemented();*/ }
+        bool MacGetMetalAppearance() const    { /*wxPyRaiseNotImplemented();*/ return false; }
+    }

 #endif
 };
 
 #endif
 };
 


@@ -145,19 +154,28 @@ public:
 // is accounted for in client size calculations - all others should be taken
 // care of manually.
 
 // is accounted for in client size calculations - all others should be taken
 // care of manually.
 

+MustHaveApp(wxFrame);
+

 class wxFrame : public wxTopLevelWindow {
 public:
     %pythonAppend wxFrame         "self._setOORInfo(self)"
     %pythonAppend wxFrame()       ""
 class wxFrame : public wxTopLevelWindow {
 public:
     %pythonAppend wxFrame         "self._setOORInfo(self)"
     %pythonAppend wxFrame()       ""

+    %typemap(out) wxFrame*;    // turn off this typemap

 
 

-    wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
+    wxFrame(wxWindow* parent, 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(PreFrame)wxFrame();
+    %RenameCtor(PreFrame, wxFrame());

 
 

-    bool Create(wxWindow* parent, const wxWindowID id, const wxString& title,
+    // Turn it back on again
+    %typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, $owner); }
+
+    
+    bool Create(wxWindow* parent, const wxWindowID id=-1,
+                const wxString& title = wxPyEmptyString,

                 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,


@@ -173,8 +191,7 @@ public:
 
     // sends a size event to the window using its current size -- this has an
     // effect of refreshing the window layout
 
     // sends a size event to the window using its current size -- this has an
     // effect of refreshing the window layout

-    //
-    virtual void SendSizeEvent() { }
+    virtual void SendSizeEvent();

 
 
     // menu bar functions
 
 
     // menu bar functions


@@ -247,28 +264,37 @@ public:
     // send wxUpdateUIEvents for all menu items in the menubar,
     // or just for menu if non-NULL
     void DoMenuUpdates(wxMenu* menu = NULL);
     // send wxUpdateUIEvents for all menu items in the menubar,
     // or just for menu if non-NULL
     void DoMenuUpdates(wxMenu* menu = NULL);

+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 };
 
 //---------------------------------------------------------------------------
 %newgroup
 
 };
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxDialog);
+

 class wxDialog : public wxTopLevelWindow {
 public:
     %pythonAppend wxDialog   "self._setOORInfo(self)"
     %pythonAppend wxDialog() ""
 class wxDialog : public wxTopLevelWindow {
 public:
     %pythonAppend wxDialog   "self._setOORInfo(self)"
     %pythonAppend wxDialog() ""

+    %typemap(out) wxDialog*;    // turn off this typemap

 
     wxDialog(wxWindow* parent,
 
     wxDialog(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_DIALOG_STYLE,
              const wxString& name = wxPyDialogNameStr);
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxPyDialogNameStr);

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

 
     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_DIALOG_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,


@@ -277,16 +303,16 @@ public:
 
     // the modal dialogs have a return code - usually the id of the last
     // pressed button
 
     // the modal dialogs have a return code - usually the id of the last
     // pressed button

-    void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
-    int GetReturnCode() const { return m_returnCode; }
+    void SetReturnCode(int returnCode);
+    int GetReturnCode() const;

 
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
 
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer

-    wxSizer *CreateTextSizer( const wxString &message );
+    wxSizer* CreateTextSizer( const wxString &message );

 
     // places buttons into a horizontal wxBoxSizer
 
     // places buttons into a horizontal wxBoxSizer

-    wxSizer *CreateButtonSizer( long flags );
-
+    wxSizer* CreateButtonSizer( long flags );
+    wxStdDialogButtonSizer* CreateStdDialogButtonSizer( long flags );

 
     //void SetModal(bool flag);
 
 
     //void SetModal(bool flag);
 


@@ -300,15 +326,12 @@ public:
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 

-    // returns True if we're in a modal loop
-    %extend {
-        bool IsModalShowing() {
-        #ifdef __WXGTK__
-            return self->m_modalShowing;
-        #else
-            return self->IsModalShowing();
-        #endif
-        }
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    %pythoncode {
+        def SendSizeEvent(self):
+            self.ProcessEvent(wx.SizeEvent((-1,-1)))

     }
 };
 
     }
 };
 


@@ -316,19 +339,23 @@ public:
 %newgroup
 
 
 %newgroup
 
 

+MustHaveApp(wxMiniFrame);
+

 class wxMiniFrame : public wxFrame {
 public:
     %pythonAppend wxMiniFrame         "self._setOORInfo(self)"
     %pythonAppend wxMiniFrame()       ""
 
 class wxMiniFrame : public wxFrame {
 public:
     %pythonAppend wxMiniFrame         "self._setOORInfo(self)"
     %pythonAppend wxMiniFrame()       ""
 

-    wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
+    wxMiniFrame(wxWindow* parent, 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(PreMiniFrame)wxMiniFrame();
+    %RenameCtor(PreMiniFrame, wxMiniFrame());

 
 

-    bool Create(wxWindow* parent, const wxWindowID id, const wxString& title,
+    bool Create(wxWindow* parent, const wxWindowID id=-1,
+                const wxString& title = wxPyEmptyString,

                 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,


@@ -350,6 +377,8 @@ enum {
 };
 
 
 };
 
 

+MustHaveApp(wxSplashScreenWindow);
+

 class wxSplashScreenWindow: public wxWindow
 {
 public:
 class wxSplashScreenWindow: public wxWindow
 {
 public:


@@ -366,12 +395,14 @@ public:
 };
 
 
 };
 
 

+MustHaveApp(wxSplashScreen);
+

 class wxSplashScreen : public wxFrame {
 public:
     %pythonAppend wxSplashScreen         "self._setOORInfo(self)"
 
     wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
 class wxSplashScreen : public wxFrame {
 public:
     %pythonAppend wxSplashScreen         "self._setOORInfo(self)"
 
     wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,

-                   wxWindow* parent, wxWindowID id,
+                   wxWindow* parent, wxWindowID id=-1,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP);