wxWinCE fixes.

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 92eda41c8c466f7b4a0ad722885ac115350ba2be..f4d71460df7ae126d2d614ae116f73ebcb7e62fc 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -11,7 +11,7 @@
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -22,7 +22,8 @@
 class wxBitmapButton: public wxBitmapButtonBase
 {
 public:
 class wxBitmapButton: public wxBitmapButtonBase
 {
 public:

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

     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
                    const wxBitmap& bitmap,
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
                    const wxBitmap& bitmap,


@@ -32,8 +33,11 @@ public:
                    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);
     }

+

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxBitmap& bitmap,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxBitmap& bitmap,


@@ -43,13 +47,13 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 

-    virtual void SetDefault();
-    virtual bool Enable(bool enable = TRUE);
-

     void SetLabel( const wxString &label );
     wxString GetLabel() const;
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 
     void SetLabel( const wxString &label );
     wxString GetLabel() const;
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 

+    virtual void SetDefault();
+    virtual bool Enable(bool enable = TRUE);
+

     // implementation
     // --------------
 
     // implementation
     // --------------
 


@@ -57,13 +61,16 @@ public:
     void NotFocus();
     void StartSelect();
     void EndSelect();
     void NotFocus();
     void StartSelect();
     void EndSelect();

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

 
 

-    bool         m_hasFocus;
-    bool         m_isSelected;
+    bool         m_hasFocus:1;
+    bool         m_isSelected:1;

 
 protected:
     virtual void OnSetBitmap();
 
 protected:
     virtual void OnSetBitmap();

+    virtual wxSize DoGetBestSize() const;
+
+    void Init();

 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)