#undef things which require other, disabled, ones, instead of re-#defining them as 1

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

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 03cb30b65769e940fea1881c6a006e2241edf106..7b1cd37dccf0d3e3f76f88d7852c5f056f1b6705 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_TBAR95_H_
-#define _WX_TBAR95_H_
+#ifndef _WX_MSW_TBAR95_H_
+#define _WX_MSW_TBAR95_H_

 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "tbar95.h"
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "tbar95.h"


@@ -19,6 +19,7 @@
 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"
 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"

+#include "wx/imaglist.h"

 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase
 {
 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase
 {


@@ -67,6 +68,7 @@ public:
 
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);

+    void OnEraseBackground(wxEraseEvent& event);

 
     void SetFocus() {}
 
 
     void SetFocus() {}
 


@@ -115,9 +117,18 @@ protected:
     // should be called whenever the toolbar size changes
     void UpdateSize();
 
     // should be called whenever the toolbar size changes
     void UpdateSize();
 

+    // create m_disabledImgList (but doesn't fill it), set it to NULL if it is
+    // unneeded
+    void CreateDisabledImageList();
+
+

     // the big bitmap containing all bitmaps of the toolbar buttons
     WXHBITMAP m_hBitmap;
 
     // the big bitmap containing all bitmaps of the toolbar buttons
     WXHBITMAP m_hBitmap;
 

+    // the image list with disabled images, may be NULL if we use
+    // system-provided versions of them
+    wxImageList *m_disabledImgList;
+

     // the total number of toolbar elements
     size_t m_nButtons;
 
     // the total number of toolbar elements
     size_t m_nButtons;
 


@@ -132,5 +143,5 @@ private:
 
 #endif // wxUSE_TOOLBAR
 
 
 #endif // wxUSE_TOOLBAR
 

-#endif
-    // _WX_TBAR95_H_
+#endif // _WX_MSW_TBAR95_H_
+