fixed typo

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

diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 33d3016044c06dd57cb117f769e84b89431bef08..f62099e5f4c6dc3f9151ea010941a18d6757937b 100644 (file)
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -15,17 +15,48 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    // Put some wx default wxChar* values into wxStrings.
-    DECLARE_DEF_STRING(FrameNameStr);
-    DECLARE_DEF_STRING(DialogNameStr);
-    DECLARE_DEF_STRING(StatusLineNameStr);
-    DECLARE_DEF_STRING(ToolBarNameStr);
-%}
+MAKE_CONST_WXSTRING(FrameNameStr);
+MAKE_CONST_WXSTRING(DialogNameStr);
+MAKE_CONST_WXSTRING(StatusLineNameStr);
+MAKE_CONST_WXSTRING(ToolBarNameStr);

 
 //---------------------------------------------------------------------------
 %newgroup
 
 
 //---------------------------------------------------------------------------
 %newgroup
 

+enum
+{
+    wxSTAY_ON_TOP,
+    wxICONIZE,
+    wxMINIMIZE,
+    wxMAXIMIZE,
+    wxCLOSE_BOX,
+    wxTHICK_FRAME,
+    wxSYSTEM_MENU,
+    wxMINIMIZE_BOX,
+    wxMAXIMIZE_BOX,
+    wxTINY_CAPTION_HORIZ,
+    wxTINY_CAPTION_VERT,
+    wxRESIZE_BOX,
+    wxRESIZE_BORDER,
+
+    wxDIALOG_NO_PARENT,
+    
+    wxDEFAULT_FRAME_STYLE,
+    wxDEFAULT_DIALOG_STYLE,
+
+    wxFRAME_TOOL_WINDOW,
+    wxFRAME_FLOAT_ON_PARENT,
+    wxFRAME_NO_WINDOW_MENU,
+    wxFRAME_NO_TASKBAR,
+    wxFRAME_SHAPED,
+
+    // Obsolete
+    wxDIALOG_MODAL,
+    wxDIALOG_MODELESS,
+    wxUSER_COLOURS,
+    wxNO_3D,
+};    
+

 enum
 {
     wxFULLSCREEN_NOMENUBAR,
 enum
 {
     wxFULLSCREEN_NOMENUBAR,


@@ -39,18 +70,6 @@ enum
 };
 
 
 };
 
 

-
-%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;
-}
-
-

 //---------------------------------------------------------------------------
 
 class  wxTopLevelWindow : public wxWindow
 //---------------------------------------------------------------------------
 
 class  wxTopLevelWindow : public wxWindow


@@ -59,19 +78,19 @@ public:
 
     // No constructor as it can not be used directly from Python
 
 
     // No constructor as it can not be used directly from Python
 

-    // maximize = TRUE => maximize, otherwise - restore
-    virtual void Maximize(bool maximize = TRUE);
+    // maximize = True => maximize, otherwise - restore
+    virtual void Maximize(bool maximize = True);

 
     // undo Maximize() or Iconize()
     virtual void Restore();
 
 
     // undo Maximize() or Iconize()
     virtual void Restore();
 

-    // iconize = TRUE => iconize, otherwise - restore
-    virtual void Iconize(bool iconize = TRUE);
+    // iconize = True => iconize, otherwise - restore
+    virtual void Iconize(bool iconize = True);

 
 

-    // return TRUE if the frame is maximized
+    // return True if the frame is maximized

     virtual bool IsMaximized() const;
 
     virtual bool IsMaximized() const;
 

-    // return TRUE if the frame is iconized
+    // return True if the frame is iconized

     virtual bool IsIconized() const;
 
     // get the frame icon
     virtual bool IsIconized() const;
 
     // get the frame icon


@@ -86,17 +105,21 @@ public:
     // maximize the window to cover entire screen
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
 
     // maximize the window to cover entire screen
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
 

-    // return TRUE if the frame is in fullscreen mode
+    // return True if the frame is in fullscreen mode

     virtual bool IsFullScreen() const;
 
     virtual void SetTitle(const wxString& title);
     virtual wxString GetTitle() const;
 
     // Set the shape of the window to the given region.
     virtual bool IsFullScreen() const;
 
     virtual void SetTitle(const wxString& title);
     virtual wxString GetTitle() const;
 
     // Set the shape of the window to the given region.

-    // Returns TRUE if the platform supports this feature (and the operation
+    // Returns True if the platform supports this feature (and the operation

     // is successful.)
     virtual bool SetShape(const wxRegion& region);
 
     // is successful.)
     virtual bool SetShape(const wxRegion& region);
 

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

 };
 
 
 };
 
 


@@ -110,19 +133,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:
 class wxFrame : public wxTopLevelWindow {
 public:

-    %addtofunc wxFrame         "self._setOORInfo(self)"
-    %addtofunc wxFrame()       ""
+    %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);
     %name(PreFrame)wxFrame();
 
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
             const wxString& name = wxPyFrameNameStr);
     %name(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,


@@ -139,7 +171,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


@@ -149,7 +181,7 @@ public:
     virtual wxMenuBar *GetMenuBar() const;
 
 
     virtual wxMenuBar *GetMenuBar() const;
 
 

-    // process menu command: returns TRUE if processed
+    // process menu command: returns True if processed

     bool ProcessCommand(int winid);
     %pythoncode { Command = ProcessCommand }
 
     bool ProcessCommand(int winid);
     %pythoncode { Command = ProcessCommand }
 


@@ -159,7 +191,7 @@ public:
 
     // create the main status bar by calling OnCreateStatusBar()
     virtual wxStatusBar* CreateStatusBar(int number = 1,
 
     // create the main status bar by calling OnCreateStatusBar()
     virtual wxStatusBar* CreateStatusBar(int number = 1,

-                                         long style = wxST_SIZEGRIP,
+                                         long style = wxDEFAULT_STATUSBAR_STYLE,

                                          wxWindowID winid = 0,
                                          const wxString& name = wxPyStatusLineNameStr);
 // TODO: with directors?
                                          wxWindowID winid = 0,
                                          const wxString& name = wxPyStatusLineNameStr);
 // TODO: with directors?


@@ -204,36 +236,45 @@ public:
     virtual void SetToolBar(wxToolBar *toolbar);
 
 
     virtual void SetToolBar(wxToolBar *toolbar);
 
 

-    // show help text (typically in the statusbar); show is FALSE
-    // if you are hiding the help, TRUE otherwise
+    // show help text (typically in the statusbar); show is False
+    // if you are hiding the help, True otherwise

     virtual void DoGiveHelp(const wxString& text, bool show);
 
 
     // send wxUpdateUIEvents for all menu items in the menubar,
     // or just for menu if non-NULL
     void DoMenuUpdates(wxMenu* menu = NULL);
     virtual void DoGiveHelp(const wxString& text, bool show);
 
 
     // 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:
 class wxDialog : public wxTopLevelWindow {
 public:

-    %addtofunc wxDialog   "self._setOORInfo(self)"
-    %addtofunc wxDialog() ""
+    %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);
     %name(PreDialog)wxDialog();
 
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxPyDialogNameStr);
     %name(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,


@@ -242,8 +283,8 @@ 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


@@ -253,7 +294,9 @@ public:
     wxSizer *CreateButtonSizer( long flags );
 
 
     wxSizer *CreateButtonSizer( long flags );
 
 

-    void SetModal(bool flag);
+    //void SetModal(bool flag);
+
+    // is the dialog in modal state right now?

     virtual bool IsModal() const;
 
     // Shows the dialog and starts a nested event loop that returns when
     virtual bool IsModal() const;
 
     // Shows the dialog and starts a nested event loop that returns when


@@ -263,15 +306,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)))

     }
 };
 
     }
 };
 


@@ -279,19 +319,23 @@ public:
 %newgroup
 
 
 %newgroup
 
 

+MustHaveApp(wxMiniFrame);
+

 class wxMiniFrame : public wxFrame {
 public:
 class wxMiniFrame : public wxFrame {
 public:

-    %addtofunc wxMiniFrame         "self._setOORInfo(self)"
-    %addtofunc wxMiniFrame()       ""
+    %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);
     %name(PreMiniFrame)wxMiniFrame();
 
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxPyFrameNameStr);
     %name(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,


@@ -313,10 +357,12 @@ enum {
 };
 
 
 };
 
 

+MustHaveApp(wxSplashScreenWindow);
+

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

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

 
     wxSplashScreenWindow(const wxBitmap& bitmap,
                          wxWindow* parent, wxWindowID id,
 
     wxSplashScreenWindow(const wxBitmap& bitmap,
                          wxWindow* parent, wxWindowID id,


@@ -329,12 +375,14 @@ public:
 };
 
 
 };
 
 

+MustHaveApp(wxSplashScreen);
+

 class wxSplashScreen : public wxFrame {
 public:
 class wxSplashScreen : public wxFrame {
 public:

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

 
     wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
 
     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);