X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dda4f6c089cd8db779cd10904be3263c72d98700..61f3e0f5c172147d5ba76fc7f099472c1e05aba4:/include/wx/univ/frame.h diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index 4f13277f1e..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();