//---------------------------------------------------------------------------
-%{
- // 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
+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,
// is successful.)
virtual bool SetShape(const wxRegion& region);
+#ifdef __WXMAC__
+ void MacSetMetalAppearance( bool on ) ;
+ bool MacGetMetalAppearance() const ;
+#endif
};
class wxFrame : public wxTopLevelWindow {
public:
- %addtofunc wxFrame "self._setOORInfo(self)"
- %addtofunc wxFrame() ""
+ %pythonAppend wxFrame "self._setOORInfo(self)"
+ %pythonAppend wxFrame() ""
wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
// 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?
// 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);
};
//---------------------------------------------------------------------------
class wxDialog : public wxTopLevelWindow {
public:
- %addtofunc wxDialog "self._setOORInfo(self)"
- %addtofunc wxDialog() ""
+ %pythonAppend wxDialog "self._setOORInfo(self)"
+ %pythonAppend wxDialog() ""
wxDialog(wxWindow* parent,
const wxWindowID id,
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
// 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);
};
//---------------------------------------------------------------------------
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,
const wxPoint& pos = wxDefaultPosition,
class wxSplashScreenWindow: public wxWindow
{
public:
- %addtofunc wxSplashScreenWindow "self._setOORInfo(self)"
+ %pythonAppend wxSplashScreenWindow "self._setOORInfo(self)"
wxSplashScreenWindow(const wxBitmap& bitmap,
wxWindow* parent, wxWindowID id,
class wxSplashScreen : public wxFrame {
public:
- %addtofunc wxSplashScreen "self._setOORInfo(self)"
+ %pythonAppend wxSplashScreen "self._setOORInfo(self)"
wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds,
wxWindow* parent, wxWindowID id,