changed make_int, make_exp .. to wxmake_int..

[wxWidgets.git] / include / wx / motif / bmpbuttn.h

diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index bb5ea2f503f9a583b3b21b65973452287447b65e..66e0ed7713142e8b15e7737501e79cf698e0e0c9 100644 (file)
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -63,11 +63,21 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
   inline int GetMarginX() { return m_marginX; }
   inline int GetMarginY() { return m_marginY; }
 
+// Implementation
+  void DoSetBitmap();
+  virtual void ChangeBackgroundColour();
+
  protected:
+  wxBitmap m_buttonBitmapFocus;
   wxBitmap m_buttonBitmap;
+  wxBitmap m_buttonBitmapOriginal; // May be different from m_buttonBitmap
+                                   // if m_buttonBitmap has been changed
+                                   // to reflect button background colour
   wxBitmap m_buttonBitmapSelected;
-  wxBitmap m_buttonBitmapFocus;
+  wxBitmap m_buttonBitmapSelectedOriginal;
+
   wxBitmap m_buttonBitmapDisabled;
+  wxBitmap m_buttonBitmapDisabledOriginal;
 
   int      m_marginX;
   int      m_marginY;