don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 68fe9bb8a4a4f0f586945618892b9379dac0f921..a0a17b3ac091472da5616925e1c78b184a7ee8b7 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -7,30 +7,27 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __BMPBUTTONH__
-#define __BMPBUTTONH__
+#ifndef _WX_GTK_BMPBUTTON_H_
+#define _WX_GTK_BMPBUTTON_H_

 
 // ----------------------------------------------------------------------------
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase

 {
 public:
 {
 public:

-    wxBitmapButton() { Init(); }
+    wxBitmapButton() { }

 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,

-                   long style = wxBU_AUTODRAW,
+                   long style = 0,

                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {

-        Init();
-

         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
 
         Create(parent, id, bitmap, pos, size, style, validator, name);
     }
 


@@ -39,35 +36,22 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxBU_AUTODRAW,
+                long style = 0,

                 const wxValidator& validator = wxDefaultValidator,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = wxButtonNameStr);
-
-    void SetLabel( const wxString &label );
-    virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
-
-    virtual bool Enable(bool enable = TRUE);
-
-    // implementation
-    // --------------
-
-    void HasFocus();
-    void NotFocus();
-    void StartSelect();
-    void EndSelect();
-
-    bool         m_hasFocus:1;
-    bool         m_isSelected:1;
+                const wxString& name = wxButtonNameStr)
+    {
+        if ( !wxBitmapButtonBase::Create(parent, id, "",
+                                         pos, size,
+                                         style | wxBU_NOTEXT,
+                                         validator, name) )
+            return false;

 
 

-protected:
-    virtual void OnSetBitmap();
-    virtual wxSize DoGetBestSize() const;
-    void DoApplyWidgetStyle(GtkRcStyle *style);
+        SetBitmapLabel(bitmap);

 
 

-    void Init();
+        return true;
+    }

 
 

-private:

     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 };
 

-#endif // __BMPBUTTONH__
+#endif // _WX_GTK_BMPBUTTON_H_