added GAUGE standard colour and use it in DrawProgressBar() if the colour

[wxWidgets.git] / include / wx / msw / tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 50bcf72eb2f336df71e972e536eb2837913cead1..01949b91cb2dc00c0519f5bad17d5b7eef4d5890 100644 (file)
--- 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);
 
     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();
 protected:
     // common part of all ctors
     void Init();


@@ -99,16 +101,12 @@ protected:
     // the total number of toolbar elements
     size_t m_nButtons;
 
     // 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)
 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
 };
 
 #endif // wxUSE_TOOLBAR