don't use deprecated wxMenuItem methods

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index ca57fcc514b735b176ea9c5d9dde0480f2709f98..61e1ad1396012e6518706b3cdcc64ef039aad0cf 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,15 +10,15 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_BUTTON
 
 #if wxUSE_BUTTON
 

-#include "wx/button.h"
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
+

 #include "wx/stockitem.h"
 
 #include "wx/gtk/private.h"
 #include "wx/stockitem.h"
 
 #include "wx/gtk/private.h"

-#include "wx/gtk/win_gtk.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -26,13 +26,6 @@
 
 class wxButton;
 
 
 class wxButton;
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -46,9 +39,6 @@ extern bool   g_blockEventsOnDrag;
 extern "C" {
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {
 extern "C" {
 static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *button )
 {

-    if (g_isIdle)
-       wxapp_install_idle_handler();
-

     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 


@@ -65,9 +55,6 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
 static gint
 gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), wxButton *win )
 {
 static gint
 gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), wxButton *win )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     int left_border = 0;
     int right_border = 0;
     int top_border = 0;
     int left_border = 0;
     int right_border = 0;
     int top_border = 0;


@@ -76,7 +63,6 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w
     /* the default button has a border around it */
     if (GTK_WIDGET_CAN_DEFAULT(m_widget))
     {
     /* the default button has a border around it */
     if (GTK_WIDGET_CAN_DEFAULT(m_widget))
     {

-#ifdef __WXGTK20__

         GtkBorder *default_border = NULL;
         gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
         if (default_border)
         GtkBorder *default_border = NULL;
         gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
         if (default_border)


@@ -85,18 +71,13 @@ gtk_button_style_set_callback( GtkWidget *m_widget, GtkStyle *WXUNUSED(style), w
             right_border += default_border->right;
             top_border += default_border->top;
             bottom_border += default_border->bottom;
             right_border += default_border->right;
             top_border += default_border->top;
             bottom_border += default_border->bottom;

-            g_free( default_border );
+            gtk_border_free( default_border );

         }
         }

-#else
-        left_border = 6;
-        right_border = 6;
-        top_border = 6;
-        bottom_border = 5;
-#endif
-        win->DoMoveWindow( win->m_x-top_border,
-                           win->m_y-left_border,
-                           win->m_width+left_border+right_border,
-                           win->m_height+top_border+bottom_border );
+        win->MoveWindow(
+            win->m_x - left_border,
+            win->m_y - top_border,
+            win->m_width + left_border + right_border,
+            win->m_height + top_border + bottom_border);

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -116,25 +97,23 @@ wxButton::~wxButton()
 {
 }
 
 {
 }
 

-bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxValidator& validator, const wxString &name )
+bool wxButton::Create(wxWindow *parent,
+                      wxWindowID id,
+                      const wxString &label,
+                      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 ))
     {
         wxFAIL_MSG( wxT("wxButton creation failed") );
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxButton creation failed") );

-        return FALSE;
+        return false;

     }
 
     }
 

-#ifdef __WXGTK20__

     m_widget = gtk_button_new_with_mnemonic("");
     m_widget = gtk_button_new_with_mnemonic("");

-#else
-    m_widget = gtk_button_new_with_label("");
-#endif

 
     float x_alignment = 0.5;
     if (HasFlag(wxBU_LEFT))
 
     float x_alignment = 0.5;
     if (HasFlag(wxBU_LEFT))


@@ -156,8 +135,8 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else
 #endif
     {
     else
 #endif
     {

-        if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
-            gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+        if (GTK_IS_MISC(GTK_BIN(m_widget)->child))
+            gtk_misc_set_alignment(GTK_MISC(GTK_BIN(m_widget)->child),

                                 x_alignment, y_alignment);
     }
 
                                 x_alignment, y_alignment);
     }
 


@@ -166,11 +145,13 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 

-    gtk_signal_connect_after( GTK_OBJECT(m_widget), "clicked",
-      GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+    g_signal_connect_after (m_widget, "clicked",
+                            G_CALLBACK (gtk_button_clicked_callback),
+                            this);

 
 

-    gtk_signal_connect_after( GTK_OBJECT(m_widget), "style_set",
-      GTK_SIGNAL_FUNC(gtk_button_style_set_callback), (gpointer*) this );
+    g_signal_connect_after (m_widget, "style_set",
+                            G_CALLBACK (gtk_button_style_set_callback),
+                            this);

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -180,24 +161,22 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
 }
 
 
 }
 
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
 {

-    wxWindow *parent = GetParent();
-    wxCHECK_RET( parent, _T("button without parent?") );
-
-    parent->SetDefaultItem(this);
+    wxWindow *oldDefault = wxButtonBase::SetDefault();

 
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
 
     // resize for default border
     gtk_button_style_set_callback( m_widget, NULL, this );
 
     GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     gtk_widget_grab_default( m_widget );
 
     // resize for default border
     gtk_button_style_set_callback( m_widget, NULL, this );

+
+    return oldDefault;

 }
 
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {
 }
 
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {

-#ifdef __WXGTK20__

     static wxSize size = wxDefaultSize;
     if (size == wxDefaultSize)
     {
     static wxSize size = wxDefaultSize;
     if (size == wxDefaultSize)
     {


@@ -228,9 +207,6 @@ wxSize wxButtonBase::GetDefaultSize()
         gtk_widget_destroy(wnd);
     }
     return size;
         gtk_widget_destroy(wnd);
     }
     return size;

-#else
-    return wxSize(80,26);
-#endif

 }
 
 void wxButton::SetLabel( const wxString &lbl )
 }
 
 void wxButton::SetLabel( const wxString &lbl )


@@ -246,7 +222,6 @@ void wxButton::SetLabel( const wxString &lbl )
 
     const wxString labelGTK = GTKConvertMnemonics(label);
 
 
     const wxString labelGTK = GTKConvertMnemonics(label);
 

-#ifdef __WXGTK20__

     if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
     {
         const char *stock = wxGetStockGtkID(m_windowId);
     if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label))
     {
         const char *stock = wxGetStockGtkID(m_windowId);


@@ -262,34 +237,27 @@ void wxButton::SetLabel( const wxString &lbl )
     gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
 
     ApplyWidgetStyle( false );
     gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
 
     ApplyWidgetStyle( false );

-#else // GTK+ 1
-    gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(labelGTK));
-#endif // GTK+ 2/1

 }
 
 bool wxButton::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
 }
 
 bool wxButton::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )

-        return FALSE;
+        return false;

 
 

-    gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
+    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxButton::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-#ifdef __WXGTK20__

     return GTK_BUTTON(m_widget)->event_window;
     return GTK_BUTTON(m_widget)->event_window;

-#else
-    return (window == m_widget->window);
-#endif

 }
 
 void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);
 }
 
 void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);

-    gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
+    gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);

 }
 
 wxSize wxButton::DoGetBestSize() const
 }
 
 wxSize wxButton::DoGetBestSize() const


@@ -313,10 +281,6 @@ wxSize wxButton::DoGetBestSize() const
         GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     }
 
         GTK_WIDGET_SET_FLAGS( m_widget, GTK_CAN_DEFAULT );
     }
 

-#ifndef __WXGTK20__
-    ret.x += 10;  // add a few pixels for sloppy (but common) themes
-#endif
-

     if (!HasFlag(wxBU_EXACTFIT))
     {
         wxSize defaultSize = GetDefaultSize();
     if (!HasFlag(wxBU_EXACTFIT))
     {
         wxSize defaultSize = GetDefaultSize();


@@ -336,4 +300,3 @@ wxButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_BUTTON
 }
 
 #endif // wxUSE_BUTTON

-