Add wxString::ToStdString() and ToStdWstring().

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

diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index 48a82144500bb2de19703bc7d0928bdf635ffdb3..5b189fc940fb1a14fbb7635cdca0229081aaf9c5 100644 (file)
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -54,13 +54,31 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const ;
 
 protected:
     virtual wxSize DoGetBestSize() const ;
 

-#if wxOSX_USE_COCOA
+    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);

-#endif // wxOSX_USE_COCOA

 
 

+    virtual void DoSetBitmapMargins(int x, int y)
+    {
+        m_marginX = x;
+        m_marginY = y;
+        InvalidateBestSize();
+    }
+    
+    // the margins around the bitmap
+    int m_marginX;
+    int m_marginY;
+
+    // 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];    
+    

     DECLARE_DYNAMIC_CLASS(wxButton)
     DECLARE_DYNAMIC_CLASS(wxButton)

+    DECLARE_EVENT_TABLE()

 };
 
 // OS X specific class, not part of public wx API
 };
 
 // OS X specific class, not part of public wx API


@@ -72,7 +90,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)
     {


@@ -84,7 +102,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);
 


@@ -97,7 +115,6 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const ;
 
 protected:
     virtual wxSize DoGetBestSize() const ;

-

 };
 
 #endif // _WX_OSX_BUTTON_H_
 };
 
 #endif // _WX_OSX_BUTTON_H_