merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk/bmpbuttn.h

@@ -74,6 +74,10 @@ public:
     void SetBitmapLabel( const wxBitmap& bitmap );
     void SetBitmapSelected( const wxBitmap& bitmap );
     
+    void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
+    int GetMarginX() const { return m_marginX; }
+    int GetMarginY() const { return m_marginY; }
+
     virtual bool Enable(bool enable);
   
     // implementation
@@ -93,6 +97,10 @@ public:
     wxBitmap     m_focus;
     wxBitmap     m_selected;   
   
+protected:
+    int      m_marginX;
+    int      m_marginY;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };