X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..90e572f1e5af1e51fd14e2e1e6f64fa3e258e590:/include/wx/univ/toplevel.h diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index 7941417b4e..7193a7c5e8 100644 --- a/include/wx/univ/toplevel.h +++ b/include/wx/univ/toplevel.h @@ -11,10 +11,6 @@ #ifndef __WX_UNIV_TOPLEVEL_H__ #define __WX_UNIV_TOPLEVEL_H__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univtoplevel.h" -#endif - #include "wx/univ/inpcons.h" #include "wx/univ/inphand.h" #include "wx/icon.h" @@ -97,14 +93,19 @@ class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative, { public: // construction - wxTopLevelWindow(); + wxTopLevelWindow() { Init(); } wxTopLevelWindow(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); + const wxString& name = wxFrameNameStr) + { + Init(); + + Create(parent, id, title, pos, size, style, name); + } bool Create(wxWindow *parent, wxWindowID id, @@ -138,8 +139,6 @@ public: virtual int GetMinWidth() const; virtual int GetMinHeight() const; - virtual bool ProvidesBackground() const { return TRUE; } - protected: // handle titlebar button click event virtual void ClickTitleBarButton(long button); @@ -153,12 +152,12 @@ protected: void Init(); void RefreshTitleBar(); - void OnNcPaint(wxPaintEvent& event); + void OnNcPaint(wxNcPaintEvent& event); void OnSystemMenu(wxCommandEvent& event); - // TRUE if wxTLW should render decorations (aka titlebar) itself + // true if wxTLW should render decorations (aka titlebar) itself static int ms_drawDecorations; - // TRUE if wxTLW can be iconized + // true if wxTLW can be iconized static int ms_canIconize; // true for currently active frame bool m_isActive:1;