Simplify backend enum naming, we do not need separate values for gtk and osx webkit...

[wxWidgets.git] / include / wx / osx / button.h

diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index 8959d9b14200c3a1d3de8c7363bbf035b6b7c78c..70b50548554e4c8e51a30b90ce5c008f59983101 100644 (file)
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.h
+// Name:        wx/osx/button.h

 // Purpose:     wxButton class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxButton class
 // Author:      Stefan Csomor
 // Modified by:


@@ -56,7 +56,7 @@ protected:
 
     void OnEnterWindow( wxMouseEvent& event);
     void OnLeaveWindow( wxMouseEvent& event);
 
     void OnEnterWindow( wxMouseEvent& event);
     void OnLeaveWindow( wxMouseEvent& event);

-    
+

     virtual wxBitmap DoGetBitmap(State which) const;
     virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
     virtual void DoSetBitmapPosition(wxDirection dir);
     virtual wxBitmap DoGetBitmap(State which) const;
     virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
     virtual void DoSetBitmapPosition(wxDirection dir);


@@ -65,8 +65,14 @@ protected:
     {
         m_marginX = x;
         m_marginY = y;
     {
         m_marginX = x;
         m_marginY = y;

+        InvalidateBestSize();

     }
     }

-    
+
+#if wxUSE_MARKUP && wxOSX_USE_COCOA
+    virtual bool DoSetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP && wxOSX_USE_COCOA
+
+

     // the margins around the bitmap
     int m_marginX;
     int m_marginY;
     // the margins around the bitmap
     int m_marginX;
     int m_marginY;


@@ -74,8 +80,8 @@ protected:
     // the bitmaps for the different state of the buttons, all of them may be
     // invalid and the button only shows a bitmap at all if State_Normal bitmap
     // is valid
     // the bitmaps for the different state of the buttons, all of them may be
     // invalid and the button only shows a bitmap at all if State_Normal bitmap
     // is valid

-    wxBitmap m_bitmaps[State_Max];    
-    
+    wxBitmap m_bitmaps[State_Max];
+

     DECLARE_DYNAMIC_CLASS(wxButton)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxButton)
     DECLARE_EVENT_TABLE()
 };


@@ -89,7 +95,7 @@ public:
              const wxString& label = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              const wxString& label = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,

-             long style = 0,
+             long style = wxBORDER_NONE,

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


@@ -101,7 +107,7 @@ public:
                 const wxString& label = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& label = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = 0,
+                long style = wxBORDER_NONE,

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