Rework the GTK WebKit backend history to remove the need for the map between wxWebHis...

[wxWidgets.git] / src / univ / button.cpp

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index 4d9a8430841021021d97992a0d9e705f587ad03c..7f4c253d1431f6ca05a1b0909ceb692322cc914c 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/button.cpp
+// Name:        src/univ/button.cpp

 // Purpose:     wxButton
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxButton
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -79,8 +79,6 @@ static const wxCoord DEFAULT_BTN_MARGIN_Y = 0;
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-

 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------


@@ -127,7 +125,7 @@ bool wxButton::Create(wxWindow *parent,
 
     SetLabel(label);
 
 
     SetLabel(label);
 

-    if (bitmap.Ok())
+    if (bitmap.IsOk())

         SetBitmap(bitmap); // SetInitialSize called by SetBitmap()
     else
         SetInitialSize(size);
         SetBitmap(bitmap); // SetInitialSize called by SetBitmap()
     else
         SetInitialSize(size);


@@ -172,7 +170,7 @@ wxSize wxButton::DoGetBestClientSize() const
     wxCoord width, height;
     dc.GetMultiLineTextExtent(GetLabel(), &width, &height);
 
     wxCoord width, height;
     dc.GetMultiLineTextExtent(GetLabel(), &width, &height);
 

-    if ( m_bitmap.Ok() )
+    if ( m_bitmap.IsOk() )

     {
         // allocate extra space for the bitmap
         wxCoord heightBmp = m_bitmap.GetHeight() + 2*m_marginBmpY;
     {
         // allocate extra space for the bitmap
         wxCoord heightBmp = m_bitmap.GetHeight() + 2*m_marginBmpY;


@@ -223,7 +221,7 @@ bool wxButton::DoDrawBackground(wxDC& dc)
     rect.width = size.x;
     rect.height = size.y;
 
     rect.width = size.x;
     rect.height = size.y;
 

-    if ( GetBackgroundBitmap().Ok() )
+    if ( GetBackgroundBitmap().IsOk() )

     {
         // get the bitmap and the flags
         int alignment;
     {
         // get the bitmap and the flags
         int alignment;