X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/937013e0fd914d4c42f9f5ec98da665986b93dfa..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/gtk1/listbox.cpp

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 9c89f4584c..316e4914db 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -134,7 +134,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *WXUNUSED(widget),
     if (g_isIdle)
         wxapp_install_idle_handler();
 
-    g_focusWindow = (wxWindowGTK *)NULL;
+    g_focusWindow = NULL;
 
     // don't send the window a kill focus event if it thinks that it doesn't
     // have focus already
@@ -160,7 +160,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *WXUNUSED(widget),
 // "button_release_event"
 //-----------------------------------------------------------------------------
 
-/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once
+/* we would normally emit a wxEVT_LISTBOX_DCLICK event once
    a GDK_2BUTTON_PRESS occurs, but this has the particular problem of the
    listbox keeping the focus until it receives a GDK_BUTTON_RELEASE event.
    this can lead to race conditions so that we emit the dclick event
@@ -181,7 +181,7 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
 
     if (!g_hasDoubleClicked) return FALSE;
 
-    wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+    wxCommandEvent event( wxEVT_LISTBOX_DCLICK, listbox->GetId() );
     event.SetEventObject( listbox );
 
     wxArrayInt aSelections;
@@ -234,7 +234,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
 
         clb->Check( sel, !clb->IsChecked(sel) );
 
-        wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+        wxCommandEvent event( wxEVT_CHECKLISTBOX, listbox->GetId() );
         event.SetEventObject( listbox );
         event.SetInt( sel );
         listbox->HandleWindowEvent( event );
@@ -257,7 +257,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
             return false;
     }
 
-    /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
+    /* emit wxEVT_LISTBOX_DCLICK later */
     g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
 
     return FALSE;
@@ -306,7 +306,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 
         clb->Check( sel, !clb->IsChecked(sel) );
 
-        wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+        wxCommandEvent new_event( wxEVT_CHECKLISTBOX, listbox->GetId() );
         new_event.SetEventObject( listbox );
         new_event.SetInt( sel );
         ret = listbox->HandleWindowEvent( new_event );
@@ -329,7 +329,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
             else
                 gtk_list_select_item( listbox->m_list, sel );
 
-            wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+            wxCommandEvent new_event(wxEVT_LISTBOX, listbox->GetId() );
             new_event.SetEventObject( listbox );
             wxArrayInt aSelections;
             int n, count = listbox->GetSelections(aSelections);
@@ -376,7 +376,7 @@ static void gtk_listitem_select_cb( GtkWidget *widget,
 
     if (listbox->m_blockEvent) return;
 
-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+    wxCommandEvent event(wxEVT_LISTBOX, listbox->GetId() );
     event.SetEventObject( listbox );
 
     // indicate whether this is a selection or a deselection
@@ -452,15 +452,13 @@ gtk_listbox_realized_callback( GtkWidget *WXUNUSED(widget), wxListBox *win )
 // wxListBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 
 wxListBox::wxListBox()
 {
-    m_list = (GtkList *) NULL;
+    m_list = NULL;
 #if wxUSE_CHECKLISTBOX
     m_hasCheckBoxes = false;
 #endif // wxUSE_CHECKLISTBOX
@@ -496,7 +494,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         return false;
     }
 
-    m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
+    m_widget = gtk_scrolled_window_new( NULL, NULL );
     if (style & wxLB_ALWAYS_SB)
     {
       gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
@@ -548,7 +546,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     }
     else
     {
-        m_strings = (wxSortedArrayString *)NULL;
+        m_strings = NULL;
     }
 
     Append(n, choices);
@@ -722,7 +720,7 @@ void wxListBox::DoDeleteOneItem(unsigned int n)
 
     wxCHECK_RET( child, wxT("wrong listbox index") );
 
-    GList *list = g_list_append( (GList*) NULL, child->data );
+    GList *list = g_list_append( NULL, child->data );
     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 
@@ -774,7 +772,7 @@ wxString wxListBox::GetRealLabel(GList *item) const
     str = wxString( label->label );
 
 #if wxUSE_CHECKLISTBOX
-    // checklistboxes have "[±] " prepended to their lables, remove it
+    // checklistboxes have "[±] " prepended to their lables, remove it
     //
     // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk1/checklst.h
     if ( m_hasCheckBoxes )
@@ -994,7 +992,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
     GList *child = m_list->children;
     while (child)
     {
-        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
+        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), NULL );
         child = child->next;
     }
 }
@@ -1014,7 +1012,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 
 void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    if (m_hasBgCol && m_backgroundColour.Ok())
+    if (m_hasBgCol && m_backgroundColour.IsOk())
     {
         GdkWindow *window = GTK_WIDGET(m_list)->window;
         if ( window )
@@ -1041,9 +1039,9 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
 void wxListBox::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;
-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+    if (g_globalCursor.IsOk()) cursor = g_globalCursor;
 
-    if (GTK_WIDGET(m_list)->window && cursor.Ok())
+    if (GTK_WIDGET(m_list)->window && cursor.IsOk())
     {
         /* I now set the cursor the anew in every OnInternalIdle call
            as setting the cursor in a parent window also effects the