X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c430d0dc64b9d9956d19575cb92237904910266f..c437fde9f90fc7dfcac79053d214fc9146d7be21:/wxPython/src/_toplvl.i diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i index ac8e1f0b59..6661972137 100644 --- a/wxPython/src/_toplvl.i +++ b/wxPython/src/_toplvl.i @@ -50,6 +50,9 @@ enum wxFRAME_NO_TASKBAR, wxFRAME_SHAPED, wxFRAME_DRAWER, + + wxFRAME_EX_METAL, + wxDIALOG_EX_METAL, // Obsolete wxDIALOG_MODAL, @@ -128,10 +131,18 @@ public: // 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 ; +#else + %extend { + // TODO: Should they raise not implemented or just NOP??? + void MacSetMetalAppearance( bool on ) { /*wxPyRaiseNotImplemented();*/ } + bool MacGetMetalAppearance() const { /*wxPyRaiseNotImplemented();*/ return false; } + } #endif }; @@ -160,7 +171,7 @@ public: 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); } @@ -183,7 +194,6 @@ public: // sends a size event to the window using its current size -- this has an // effect of refreshing the window layout - // virtual void SendSizeEvent(); @@ -280,7 +290,7 @@ public: 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); } @@ -301,11 +311,11 @@ public: // 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 - wxSizer *CreateButtonSizer( long flags ); - + wxSizer* CreateButtonSizer( long flags ); + wxStdDialogButtonSizer* CreateStdDialogButtonSizer( long flags ); //void SetModal(bool flag); @@ -345,7 +355,7 @@ public: 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,