Added #include wx/dcclient.h and wx/settings.h for Vadims new code under

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

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 2c1d4c702c8f5b5191480c11006882fe6ca6ee9b..bd63c5e3f805ee8ae64d7b3e6527f1dd3c4e4b0e 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -14,9 +14,18 @@
 
 #include "wx/choice.h"
 
 
 #include "wx/choice.h"
 

+#if wxUSE_CHOICE
+

 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 

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

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


@@ -29,17 +38,17 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
 
 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {

-  if (!choice->HasVMT())
-      return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!choice->m_hasVMT) return;

 
 

-  if (g_blockEventsOnDrag)
-      return;
+    if (g_blockEventsOnDrag) return;

 
 

-  wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
-  event.SetInt( choice->GetSelection() );
-  event.SetString( choice->GetStringSelection() );
-  event.SetEventObject(choice);
-  choice->GetEventHandler()->ProcessEvent(event);
+    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
+    event.SetInt( choice->GetSelection() );
+    event.SetString( choice->GetStringSelection() );
+    event.SetEventObject(choice);
+    choice->GetEventHandler()->ProcessEvent(event);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -64,7 +73,9 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     PreCreation( parent, id, pos, size, style, name );
 
 
     PreCreation( parent, id, pos, size, style, name );
 

+#if wxUSE_VALIDATORS

     SetValidator( validator );
     SetValidator( validator );

+#endif

 
     m_widget = gtk_option_menu_new();
 
 
     m_widget = gtk_option_menu_new();
 


@@ -85,9 +96,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
         GtkWidget *item = gtk_menu_item_new_with_label( choices[i].mbc_str() );
         gtk_menu_append( GTK_MENU(menu), item );
 
         GtkWidget *item = gtk_menu_item_new_with_label( choices[i].mbc_str() );
         gtk_menu_append( GTK_MENU(menu), item );
 

-        gtk_widget_realize( item );
-        gtk_widget_realize( GTK_BIN(item)->child );
-

         gtk_widget_show( item );
 
         gtk_signal_connect( GTK_OBJECT( item ), "activate",
         gtk_widget_show( item );
 
         gtk_signal_connect( GTK_OBJECT( item ), "activate",


@@ -95,9 +103,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
     }
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
 
     }
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
 

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

 
     PostCreation();
 
 
     PostCreation();
 


@@ -124,10 +130,13 @@ void wxChoice::AppendCommon( const wxString &item )
 
     gtk_menu_append( GTK_MENU(menu), menu_item );
 
 
     gtk_menu_append( GTK_MENU(menu), menu_item );
 

-    gtk_widget_realize( menu_item );
-    gtk_widget_realize( GTK_BIN(menu_item)->child );
+    if (GTK_WIDGET_REALIZED(m_widget))
+    {
+        gtk_widget_realize( menu_item );
+        gtk_widget_realize( GTK_BIN(menu_item)->child );

 
 

-    if (m_widgetStyle) ApplyWidgetStyle();
+        if (m_widgetStyle) ApplyWidgetStyle();
+    }

 
     gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );


@@ -246,7 +255,7 @@ int wxChoice::FindString( const wxString &string ) const
 
         wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 
 
         wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 

-       if (string == label->label)
+       if (string == wxString(label->label,*wxConvCurrent))

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


@@ -299,7 +308,7 @@ wxString wxChoice::GetString( int n ) const
 
             wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 
 
             wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 

-            return label->label;
+            return wxString(label->label,*wxConvCurrent);

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


@@ -307,7 +316,7 @@ wxString wxChoice::GetString( int n ) const
 
     wxFAIL_MSG( _T("wxChoice: invalid index in GetString()") );
 
 
     wxFAIL_MSG( _T("wxChoice: invalid index in GetString()") );
 

-    return "";
+    return _T("");

 }
 
 wxString wxChoice::GetStringSelection() const
 }
 
 wxString wxChoice::GetStringSelection() const


@@ -318,7 +327,7 @@ wxString wxChoice::GetStringSelection() const
 
     wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 
 
     wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") );
 

-    return label->label;
+    return wxString(label->label,*wxConvCurrent);

 }
 
 int wxChoice::Number() const
 }
 
 int wxChoice::Number() const


@@ -383,3 +392,4 @@ void wxChoice::ApplyWidgetStyle()
     }
 }
 
     }
 }
 

+#endif