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

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

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index ca651c8b61467b2fc84dfee1ba72c845d2eed271..cf429bd2fe9c3ab7468e96378e19d2141a5ab462 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -1,289 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/bmpbuttn.cpp
+// Name:        src/gtk/bmpbuttn.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "bmpbuttn.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_BMPBUTTON
 
 #include "wx/bmpbuttn.h"
 
 
 #if wxUSE_BMPBUTTON
 
 #include "wx/bmpbuttn.h"
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxBitmapButton;
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool   g_blockEventsOnDrag;
-
-//-----------------------------------------------------------------------------
-// "clicked"
-//-----------------------------------------------------------------------------
-
-static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
-    event.SetEventObject(button);
-    button->GetEventHandler()->ProcessEvent(event);
-}
-
-//-----------------------------------------------------------------------------
-// "enter"
-//-----------------------------------------------------------------------------
-
-static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->HasFocus();
-}
-
-//-----------------------------------------------------------------------------
-// "leave"
-//-----------------------------------------------------------------------------
-
-static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->NotFocus();
-}
-
-//-----------------------------------------------------------------------------
-// "pressed"
-//-----------------------------------------------------------------------------
-
-static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
+bool wxBitmapButton::Create(wxWindow *parent,
+                            wxWindowID id,
+                            const wxBitmap& bitmap,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name)

 {
 {

-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
+    if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style,
+                                     validator, name) )
+        return false;

 
 

-    button->StartSelect();
-}
-
-//-----------------------------------------------------------------------------
-// "released"
-//-----------------------------------------------------------------------------
-
-static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
-{
-    if (!button->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    button->EndSelect();
-}
-
-//-----------------------------------------------------------------------------
-// wxBitmapButton
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
-
-wxBitmapButton::wxBitmapButton()
-{
-}
-
-bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-                             const wxPoint &pos, const wxSize &size,
-                             long style, const wxValidator& validator, const wxString &name )
-{
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, validator, name ))
+    if ( bitmap.IsOk() )

     {
     {

-        wxFAIL_MSG( wxT("wxBitmapButton creation failed") );
-        return FALSE;
-    }
-
-    m_bmpNormal   =
-    m_bmpDisabled =
-    m_bmpFocus    =
-    m_bmpSelected = bitmap;
-
-    m_widget = gtk_button_new();
-
-#if (GTK_MINOR_VERSION > 0)
-    if (style & wxNO_BORDER)
-       gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
-#endif
+        SetBitmapLabel(bitmap);

 
 

-    if (m_bmpNormal.Ok())
-    {
-        wxSize newSize = size;
-        int border = (style & wxNO_BORDER) ? 4 : 10;
-        if (newSize.x == -1)
-            newSize.x = m_bmpNormal.GetWidth()+border;
-        if (newSize.y == -1)
-            newSize.y = m_bmpNormal.GetHeight()+border;
-        SetSize( newSize.x, newSize.y );
-        OnSetBitmap();
+        // we need to adjust the size after setting the bitmap as it may be too
+        // big for the default button size
+        SetInitialSize(size);

     }
 
     }
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );
-
-    gtk_signal_connect( GTK_OBJECT(m_widget), "enter",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_enter_callback), (gpointer*)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "leave",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_leave_callback), (gpointer*)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "pressed",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_press_callback), (gpointer*)this );
-    gtk_signal_connect( GTK_OBJECT(m_widget), "released",
-      GTK_SIGNAL_FUNC(gtk_bmpbutton_release_callback), (gpointer*)this );
-
-    m_parent->DoAddChild( this );
-
-    PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-
-    Show( TRUE );
-
-    return TRUE;
-}
-
-void wxBitmapButton::SetDefault()
-{
-    GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
-    gtk_widget_grab_default( m_widget );
-
-    SetSize( m_x, m_y, m_width, m_height );
-}
-
-void wxBitmapButton::SetLabel( const wxString &label )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
-
-    wxControl::SetLabel( label );
-}
-
-wxString wxBitmapButton::GetLabel() const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") );
-
-    return wxControl::GetLabel();
-}
-
-void wxBitmapButton::ApplyWidgetStyle()
-{
-    if (GTK_BUTTON(m_widget)->child == NULL) return;
-
-    wxButton::ApplyWidgetStyle();
-}
-
-void wxBitmapButton::OnSetBitmap()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") );
-
-    wxBitmap the_one;
-    if (!m_isEnabled)
-        the_one = m_bmpDisabled;
-    else if (m_isSelected)
-        the_one = m_bmpSelected;
-    else if (m_hasFocus)
-        the_one = m_bmpFocus;
-    else
-    {
-        if (m_isSelected)
-        {
-            the_one = m_bmpSelected;
-        }
-        else
-        {
-            if (m_hasFocus)
-                the_one = m_bmpFocus;
-            else
-                the_one = m_bmpNormal;
-        }
-    }
-
-    if (!the_one.Ok()) the_one = m_bmpNormal;
-    if (!the_one.Ok()) return;
-
-    GdkBitmap *mask = (GdkBitmap *) NULL;
-    if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
-
-    GtkButton *bin = GTK_BUTTON(m_widget);
-    if (bin->child == NULL)
-    {
-        // initial bitmap
-        GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
-        gtk_widget_show(pixmap);
-        gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
-    }
-    else
-    {   // subsequent bitmaps
-        GtkPixmap *g_pixmap = GTK_PIXMAP(bin->child);
-        gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask);
-    }
-}
-
-bool wxBitmapButton::Enable( bool enable )
-{
-    if ( !wxWindow::Enable(enable) )
-        return FALSE;
-
-    OnSetBitmap();
-
-    return TRUE;
-}
-
-void wxBitmapButton::HasFocus()
-{
-    m_hasFocus = TRUE;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::NotFocus()
-{
-    m_hasFocus = FALSE;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::StartSelect()
-{
-    m_isSelected = TRUE;
-    OnSetBitmap();
-}
-
-void wxBitmapButton::EndSelect()
-{
-    m_isSelected = FALSE;
-    OnSetBitmap();
+    return true;

 }
 }

-

 #endif // wxUSE_BMPBUTTON
 #endif // wxUSE_BMPBUTTON

-