X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7dda1ffa3db91707f2a554fc3c8dffa34e0e510..9630336291540faadae5c661cbde6fb823156e9f:/include/wx/univ/frame.h diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index a181bba996..e30d470a49 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_FRAME_H_ #define _WX_UNIV_FRAME_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univframe.h" #endif @@ -55,7 +55,7 @@ public: #if wxUSE_TOOLBAR // create main toolbar bycalling OnCreateToolBar() - virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, + virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = -1, const wxString& name = wxToolBarNameStr); virtual void PositionToolBar(); @@ -64,12 +64,12 @@ public: virtual int GetMinWidth() const; virtual int GetMinHeight() const; + // sends wxSizeEvent to itself (used after attaching xxxBar) + virtual void SendSizeEvent(); + protected: void OnSize(wxSizeEvent& event); - // sends wxSizeEvent to itself (used after attaching xxxBar) - void SendSizeEvent(); - virtual void DoGetClientSize(int *width, int *height) const; virtual void DoSetClientSize(int width, int height);