added wxSafeConvertMB2WX/WX2MB() and use them when interfacing with C functions which...

[wxWidgets.git] / include / wx / tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 7872e6670b2539abcc26419ddad9580919eea0b7..9f0f42fa4f29b0ab5cf2fc51d45c2dfae998a4dd 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -372,9 +372,12 @@ public:
     virtual void SetToolLongHelp(int toolid, const wxString& helpString);
     virtual wxString GetToolLongHelp(int toolid) const;
 
     virtual void SetToolLongHelp(int toolid, const wxString& helpString);
     virtual wxString GetToolLongHelp(int toolid) const;
 

-    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) {}
-    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap) {}
+    virtual void SetToolNormalBitmap(int WXUNUSED(id),
+                                     const wxBitmap& WXUNUSED(bitmap)) {}
+    virtual void SetToolDisabledBitmap(int WXUNUSED(id),
+                                       const wxBitmap& WXUNUSED(bitmap)) {}

 
 

+    

     // margins/packing/separation
     // --------------------------
 
     // margins/packing/separation
     // --------------------------
 


@@ -600,8 +603,14 @@ private:
     DECLARE_NO_COPY_CLASS(wxToolBarBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxToolBarBase)
 };
 

-// Helper function for creating the image for disabled buttons
-bool wxCreateGreyedImage(const wxImage& in, wxImage& out) ;
+// deprecated function for creating the image for disabled buttons, use
+// wxImage::ConvertToGreyscale() instead
+#if WXWIN_COMPATIBILITY_2_8
+
+wxDEPRECATED( bool wxCreateGreyedImage(const wxImage& in, wxImage& out) );
+
+#endif // WXWIN_COMPATIBILITY_2_8
+

 
 #endif // wxUSE_TOOLBAR
 
 
 #endif // wxUSE_TOOLBAR