X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24998710952312c2cc1a5bfee1b416783e17319a..385facb748115a072d1361d8aec6b88273b1d7a1:/include/wx/msw/tbar95.h?ds=sidebyside diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h index 980714d08e..e184cd87c5 100644 --- a/include/wx/msw/tbar95.h +++ b/include/wx/msw/tbar95.h @@ -12,7 +12,7 @@ #ifndef _WX_TBAR95_H_ #define _WX_TBAR95_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "tbar95.h" #endif @@ -76,8 +76,8 @@ protected: // common part of all ctors void Init(); - // create the toolbar control - bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size, long style); + // create the native toolbar control + bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size); // recreate the control completely void Recreate(); @@ -127,6 +127,7 @@ protected: private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxToolBar) + DECLARE_NO_COPY_CLASS(wxToolBar) }; #endif // wxUSE_TOOLBAR