wxTinderbox warning fix.

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

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 6dbc4a9cd1485d1d02db186d00de0a2325f0cb41..0912181bcc7abe41dae5503f068e1819f1bcf430 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.cpp
+// Name:        src/gtk1/choice.cpp

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


@@ -7,19 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "choice.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"
 #include "wx/arrstr.h"
 
 
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"
 #include "wx/arrstr.h"
 

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -50,9 +45,6 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
 
     int selection = wxNOT_FOUND;
 
 
     int selection = wxNOT_FOUND;
 

-#ifdef __WXGTK20__
-    selection = gtk_option_menu_get_history( GTK_OPTION_MENU(choice->GetHandle()) );
-#else

     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(choice->GetHandle()) ) );
     int count = 0;
 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(choice->GetHandle()) ) );
     int count = 0;
 


@@ -68,7 +60,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
         child = child->next;
         count++;
     }
         child = child->next;
         count++;
     }

-#endif
+

     choice->m_selection_hack = selection;
 
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
     choice->m_selection_hack = selection;
 
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );


@@ -141,7 +133,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     GtkWidget *menu = gtk_menu_new();
 
 
     GtkWidget *menu = gtk_menu_new();
 

-    for (int i = 0; i < n; i++)
+    for (size_t i = 0; i < (size_t)n; i++)

     {
         GtkAddHelper(menu, i, choices[i]);
     }
     {
         GtkAddHelper(menu, i, choices[i]);
     }


@@ -175,9 +167,9 @@ int wxChoice::DoAppend( const wxString &item )
 int wxChoice::DoInsert( const wxString &item, int pos )
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
 int wxChoice::DoInsert( const wxString &item, int pos )
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );

-    wxCHECK_MSG( (pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+    wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index"));

 
 

-    if (pos == GetCount())
+    if ((size_t)pos == GetCount())

         return DoAppend(item);
 
     GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
         return DoAppend(item);
 
     GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );


@@ -189,7 +181,7 @@ int wxChoice::DoInsert( const wxString &item, int pos )
         m_selection_hack++;
     }
 
         m_selection_hack++;
     }
 

-    return GtkAddHelper(menu, pos, item);
+    return GtkAddHelper(menu, (size_t)pos, item);

 }
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 }
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )


@@ -270,10 +262,10 @@ void wxChoice::Delete( int n )
 
     // VZ: apparently GTK+ doesn't have a built-in function to do it (not even
     //     in 2.0), hence this dumb implementation -- still better than nothing
 
     // VZ: apparently GTK+ doesn't have a built-in function to do it (not even
     //     in 2.0), hence this dumb implementation -- still better than nothing

-    int i,
-        count = GetCount();
+    int i;
+    size_t count = GetCount();

 
 

-    wxCHECK_RET( n >= 0 && n < count, _T("invalid index in wxChoice::Delete") );
+    wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );

 
     // if the item to delete is before the selection, and the selection is valid
     if ((n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
 
     // if the item to delete is before the selection, and the selection is valid
     if ((n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))


@@ -295,7 +287,7 @@ void wxChoice::Delete( int n )
     wxArrayString items;
     wxArrayPtrVoid itemsData;
     items.Alloc(count);
     wxArrayString items;
     wxArrayPtrVoid itemsData;
     items.Alloc(count);

-    for ( i = 0; i < count; i++ )
+    for ( i = 0; (size_t)i < count; i++ )

     {
         if ( i != n )
         {
     {
         if ( i != n )
         {


@@ -328,7 +320,7 @@ void wxChoice::Delete( int n )
 
     Clear();
 
 
     Clear();
 

-    for ( i = 0; i < count - 1; i++ )
+    for ( i = 0; (size_t)i < count - 1; i++ )

     {
         Append(items[i]);
 
     {
         Append(items[i]);
 


@@ -339,9 +331,9 @@ void wxChoice::Delete( int n )
     }
 }
 
     }
 }
 

-int wxChoice::FindString( const wxString &string ) const
+int wxChoice::FindString( const wxString &string, bool bCase ) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") );

 
     // If you read this code once and you think you understand
     // it, then you are very wrong. Robert Roebling.
 
     // If you read this code once and you think you understand
     // it, then you are very wrong. Robert Roebling.


@@ -360,12 +352,9 @@ int wxChoice::FindString( const wxString &string ) const
 
         wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 
 
         wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 

-#ifdef __WXGTK20__
-         wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
-#else

          wxString tmp( label->label );
          wxString tmp( label->label );

-#endif
-        if (string == tmp)
+
+         if (string.IsSameAs( tmp, bCase ))

             return count;
 
         child = child->next;
             return count;
 
         child = child->next;


@@ -377,7 +366,7 @@ int wxChoice::FindString( const wxString &string ) const
 
 int wxChoice::GetSelection() const
 {
 
 int wxChoice::GetSelection() const
 {

-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") );

 
     return m_selection_hack;
 
 
     return m_selection_hack;
 


@@ -432,11 +421,7 @@ wxString wxChoice::GetString( int n ) const
 
             wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 
 
             wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 

-#ifdef __WXGTK20__
-            return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
-#else

             return wxString( label->label );
             return wxString( label->label );

-#endif

         }
         child = child->next;
         count++;
         }
         child = child->next;
         count++;


@@ -447,12 +432,12 @@ wxString wxChoice::GetString( int n ) const
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

-int wxChoice::GetCount() const
+size_t wxChoice::GetCount() const

 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") );
 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") );
 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );

-    int count = 0;
+    size_t count = 0;

     GList *child = menu_shell->children;
     while (child)
     {
     GList *child = menu_shell->children;
     while (child)
     {


@@ -470,7 +455,7 @@ void wxChoice::SetSelection( int n )
     gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
 
     // set the local selection variable manually
     gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
 
     // set the local selection variable manually

-    if ((n >= 0) && (n < GetCount()))
+    if ((n >= 0) && ((size_t)n < GetCount()))

     {
         // a valid selection has been made
         m_selection_hack = n;
     {
         // a valid selection has been made
         m_selection_hack = n;


@@ -513,9 +498,9 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
     }
 }
 
     }
 }
 

-int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
+int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item)

 {
 {

-    wxCHECK_MSG((pos>=0) && (pos<=(int)m_clientList.GetCount()), -1, wxT("invalid index"));
+    wxCHECK_MSG(pos<=m_clientList.GetCount(), -1, wxT("invalid index"));

 
     GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
 
 
     GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
 


@@ -543,7 +528,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
         // if we're called from ctor (and GtkMenuShell is still NULL)
 
         // normal control, just append
         // if we're called from ctor (and GtkMenuShell is still NULL)
 
         // normal control, just append

-        if (pos == (int)m_clientList.GetCount())
+        if (pos == m_clientList.GetCount())

         {
             gtk_menu_append( GTK_MENU(menu), menu_item );
             m_clientList.Append( (wxObject*) NULL );
         {
             gtk_menu_append( GTK_MENU(menu), menu_item );
             m_clientList.Append( (wxObject*) NULL );


@@ -627,11 +612,7 @@ wxSize wxChoice::DoGetBestSize() const
 
 bool wxChoice::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxChoice::IsOwnGtkWindow( GdkWindow *window )
 {

-#ifdef __WXGTK20__
-    return GTK_BUTTON(m_widget)->event_window;
-#else

     return (window == m_widget->window);
     return (window == m_widget->window);

-#endif

 }
 
 // static
 }
 
 // static