Set/GetWindowMenu added to MDI parent frame under MSW

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

diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index bb5ea2f503f9a583b3b21b65973452287447b65e..47fe63c0182510c8b89a637146148bcf90f09a0c 100644 (file)
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -47,6 +47,10 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
   {
     SetBitmapLabel(bitmap);
   }
   {
     SetBitmapLabel(bitmap);
   }

+  virtual void SetLabel(const wxString& label)
+  {
+    wxControl::SetLabel(label);
+  }

 
   virtual void SetBitmapLabel(const wxBitmap& bitmap);
 
 
   virtual void SetBitmapLabel(const wxBitmap& bitmap);
 


@@ -63,11 +67,21 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
   inline int GetMarginX() { return m_marginX; }
   inline int GetMarginY() { return m_marginY; }
 
   inline int GetMarginX() { return m_marginX; }
   inline int GetMarginY() { return m_marginY; }
 

+// Implementation
+  void DoSetBitmap();
+  virtual void ChangeBackgroundColour();
+

  protected:
  protected:

+  wxBitmap m_buttonBitmapFocus;

   wxBitmap m_buttonBitmap;
   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_buttonBitmapSelected;

-  wxBitmap m_buttonBitmapFocus;
+  wxBitmap m_buttonBitmapSelectedOriginal;
+

   wxBitmap m_buttonBitmapDisabled;
   wxBitmap m_buttonBitmapDisabled;

+  wxBitmap m_buttonBitmapDisabledOriginal;

 
   int      m_marginX;
   int      m_marginY;
 
   int      m_marginX;
   int      m_marginY;