X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e68f8f3736d7ef45252276bd22f142288bee2b9..d1fe917ba097fd8039a4340d1d82115f72cbbd91:/include/wx/msw/tbar95.h diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h index 50bcf72eb2..01949b91cb 100644 --- a/include/wx/msw/tbar95.h +++ b/include/wx/msw/tbar95.h @@ -66,6 +66,8 @@ public: void OnMouseEvent(wxMouseEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); + static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height); + protected: // common part of all ctors void Init(); @@ -99,16 +101,12 @@ protected: // the total number of toolbar elements size_t m_nButtons; + // the tool the cursor is in + wxToolBarToolBase *m_pInTool; + private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxToolBar) - - static bool sm_coloursInit; // Have we initialized the colour table yet? - static long sm_stdColours[6]; // The RGB values of the standard 6 colours - -public: - void MapBitmap(WXHBITMAP bitmap, int width, int height); - }; #endif // wxUSE_TOOLBAR