wxSplitterWindow mouse capture improvements and cleanup.

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

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 83252b6c3739997618d067899e83dca96bc1605e..1c576da3285cf4fddc9b700d7588fe8654532e01 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -16,11 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/frame.h"
+    #include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"
-#include "wx/frame.h"
-

 #include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>
 


@@ -58,7 +57,7 @@ static void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioBo
     event.SetInt( rb->GetSelection() );
     event.SetString( rb->GetStringSelection() );
     event.SetEventObject( rb );
     event.SetInt( rb->GetSelection() );
     event.SetString( rb->GetStringSelection() );
     event.SetEventObject( rb );

-    rb->GetEventHandler()->ProcessEvent(event);
+    rb->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -116,7 +115,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
 }
 
 extern "C" {
 }
 
 extern "C" {

-static gint gtk_radiobutton_focus_in( GtkWidget *widget,
+static gint gtk_radiobutton_focus_in( GtkWidget *WXUNUSED(widget),

                                       GdkEvent *WXUNUSED(event),
                                       wxRadioBox *win )
 {
                                       GdkEvent *WXUNUSED(event),
                                       wxRadioBox *win )
 {


@@ -134,7 +133,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget,
 
         // never stop the signal emission, it seems to break the kbd handling
         // inside the radiobox
 
         // never stop the signal emission, it seems to break the kbd handling
         // inside the radiobox

-        (void)win->GetEventHandler()->ProcessEvent( event );
+        (void)win->HandleWindowEvent( event );

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -142,14 +141,14 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget,
 }
 
 extern "C" {
 }
 
 extern "C" {

-static gint gtk_radiobutton_focus_out( GtkWidget *widget,
+static gint gtk_radiobutton_focus_out( GtkWidget *WXUNUSED(widget),

                                        GdkEvent *WXUNUSED(event),
                                        wxRadioBox *win )
 {
                                        GdkEvent *WXUNUSED(event),
                                        wxRadioBox *win )
 {

-  //    wxASSERT_MSG( win->m_hasFocus, _T("got focus out without any focus in?") );
+  //    wxASSERT_MSG( win->m_hasFocus, wxT("got focus out without any focus in?") );

   // Replace with a warning, else we dump core a lot!
   //  if (!win->m_hasFocus)
   // Replace with a warning, else we dump core a lot!
   //  if (!win->m_hasFocus)

-  //      wxLogWarning(_T("Radiobox got focus out without any focus in.") );
+  //      wxLogWarning(wxT("Radiobox got focus out without any focus in.") );

 
     // we might have lost the focus, but may be not - it may have just gone to
     // another button in the same radiobox, so we'll check for it in the next
 
     // we might have lost the focus, but may be not - it may have just gone to
     // another button in the same radiobox, so we'll check for it in the next


@@ -203,6 +202,11 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_widget = gtk_frame_new(NULL);
     SetLabel(title);
 
     m_widget = gtk_frame_new(NULL);
     SetLabel(title);

+    if ( HasFlag(wxNO_BORDER) )
+    {
+        // If we don't do this here, the wxNO_BORDER style is ignored in Show()
+        gtk_frame_set_shadow_type(GTK_FRAME(m_widget), GTK_SHADOW_NONE);
+    }

 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it
 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it


@@ -212,7 +216,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     unsigned int num_of_cols = GetColumnCount();
     unsigned int num_of_rows = GetRowCount();
 
     unsigned int num_of_cols = GetColumnCount();
     unsigned int num_of_rows = GetRowCount();
 

-    GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
+    GtkRadioButton *m_radio = NULL;

 
     GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE );
     gtk_table_set_col_spacings( GTK_TABLE(table), 1 );
 
     GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE );
     gtk_table_set_col_spacings( GTK_TABLE(table), 1 );


@@ -221,7 +225,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     gtk_container_add( GTK_CONTAINER(m_widget), table );
 
     wxString label;
     gtk_container_add( GTK_CONTAINER(m_widget), table );
 
     wxString label;

-    GSList *radio_button_group = (GSList *) NULL;
+    GSList *radio_button_group = NULL;

     for (int i = 0; i < n; i++)
     {
         if ( i != 0 )
     for (int i = 0; i < n; i++)
     {
         if ( i != 0 )


@@ -547,7 +551,7 @@ void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
     while (node)
     {
         GtkWidget *widget = GTK_WIDGET( node->GetData() );
     while (node)
     {
         GtkWidget *widget = GTK_WIDGET( node->GetData() );

-        gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
+        gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), NULL );

         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }


@@ -582,7 +586,7 @@ void wxRadioBox::OnInternalIdle()
         wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
         event.SetEventObject( this );
 
         wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() );
         event.SetEventObject( this );
 

-        (void)GetEventHandler()->ProcessEvent( event );
+        (void)HandleWindowEvent( event );

     }
 
     if (g_delayedFocus == this)
     }
 
     if (g_delayedFocus == this)