Detect Apple bug that prevents the joystick code compiling for OS X 10.1

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

diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 2a42716275f2d85b740a7b6550434f7a6a6d3fe4..6661972137ae88697c5eff6768524b78c484a8f3 100644 (file)
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -49,7 +49,11 @@ enum
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,
     wxFRAME_SHAPED,
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,
     wxFRAME_SHAPED,

+    wxFRAME_DRAWER,

 
 

+    wxFRAME_EX_METAL,
+    wxDIALOG_EX_METAL,
+    

     // Obsolete
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,
     // Obsolete
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,


@@ -85,13 +89,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;


@@ -127,10 +131,18 @@ public:
     // inactive (should be called when a background event occurs)
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
     // 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
 };
 


@@ -159,7 +171,7 @@ public:
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
             const wxString& name = wxPyFrameNameStr);
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
             const wxString& name = wxPyFrameNameStr);

-    %name(PreFrame)wxFrame();
+    %RenameCtor(PreFrame, wxFrame());

 
     // Turn it back on again
     %typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, $owner); }
 
     // Turn it back on again
     %typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, $owner); }


@@ -182,7 +194,6 @@ 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();
 
 


@@ -279,7 +290,7 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxPyDialogNameStr);
              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); }
 
     // Turn it back on again
     %typemap(out) wxDialog* { $result = wxPyMake_wxObject($1, $owner); }


@@ -300,11 +311,11 @@ public:
 
     // 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);
 


@@ -344,7 +355,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxPyFrameNameStr);
                 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=-1,
                 const wxString& title = wxPyEmptyString,
 
     bool Create(wxWindow* parent, const wxWindowID id=-1,
                 const wxString& title = wxPyEmptyString,