X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdc468a0a6476eff5996c80580e27b506340c305..dfb39a3727a85d0e075b10d9a9388be514d2f8e1:/src/univ/button.cpp

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index 4d9a843084..61203eab64 100644
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        univ/button.cpp
+// Name:        src/univ/button.cpp
 // Purpose:     wxButton
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.08.00
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -79,8 +78,6 @@ static const wxCoord DEFAULT_BTN_MARGIN_Y = 0;
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------
@@ -127,7 +124,7 @@ bool wxButton::Create(wxWindow *parent,
 
     SetLabel(label);
 
-    if (bitmap.Ok())
+    if (bitmap.IsOk())
         SetBitmap(bitmap); // SetInitialSize called by SetBitmap()
     else
         SetInitialSize(size);
@@ -172,7 +169,7 @@ wxSize wxButton::DoGetBestClientSize() const
     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;
@@ -223,7 +220,7 @@ bool wxButton::DoDrawBackground(wxDC& dc)
     rect.width = size.x;
     rect.height = size.y;
 
-    if ( GetBackgroundBitmap().Ok() )
+    if ( GetBackgroundBitmap().IsOk() )
     {
         // get the bitmap and the flags
         int alignment;
@@ -280,7 +277,7 @@ void wxButton::Toggle()
 
 void wxButton::Click()
 {
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+    wxCommandEvent event(wxEVT_BUTTON, GetId());
     InitCommandEvent(event);
     Command(event);
 }