Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

[wxWidgets.git] / src / gtk1 / bmpbuttn.cpp

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index a0f54cd27f7442a6ab13d1ba31be5b0c34f3644f..91301c58dd5b13606be6b62c4ef79eaa6b743193 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk1/bmpbuttn.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,7 +47,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
+    wxCommandEvent event(wxEVT_BUTTON, button->GetId());
     event.SetEventObject(button);
     button->HandleWindowEvent(event);
 }
@@ -114,8 +113,6 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
-
 void wxBitmapButton::Init()
 {
     m_hasFocus =
@@ -203,9 +200,9 @@ void wxBitmapButton::OnSetBitmap()
 
    if (!the_one.IsOk())
      {
-       the_one = GetBitmapLabel();
-       if (!the_one.IsOk())
-         return;
+         the_one = GetBitmapLabel();
+         if (!the_one.IsOk())
+             return;
      }
 
     GdkBitmap *mask = NULL;