Also update focus rect when changing selection in single selection mode, fixes #11332

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

diff --git a/src/gtk/private.cpp b/src/gtk/private.cpp
index 3f421fbb2c626364819ff8b1ba9d39a384407469..6c025795f0469988aafee8f3f78c23652cb83ecf 100644 (file)
--- a/src/gtk/private.cpp
+++ b/src/gtk/private.cpp
@@ -78,6 +78,24 @@ GtkWidget *GetCheckButtonWidget()
     return s_button;
 }
 
+GtkWidget * GetComboBoxWidget()
+{
+    static GtkWidget *s_button = NULL;
+    static GtkWidget *s_window = NULL;
+
+    if ( !s_button )
+    {
+        s_window = gtk_window_new( GTK_WINDOW_POPUP );
+        gtk_widget_realize( s_window );
+        s_button = gtk_combo_box_new();
+        gtk_container_add( GTK_CONTAINER(s_window), s_button );
+        gtk_widget_realize( s_button );
+    }
+
+    return s_button;
+}
+
+
 GtkWidget *GetEntryWidget()
 {
     static GtkWidget *s_entry = NULL;
@@ -95,18 +113,65 @@ GtkWidget *GetEntryWidget()
 // This one just gets the button used by the column header. Although it's
 // still a gtk_button the themes will typically differentiate and draw them
 // differently if the button is in a treeview.
-GtkWidget *GetHeaderButtonWidget()
-{
-    static GtkWidget *s_button = NULL;
+static GtkWidget *s_first_button = NULL;
+static GtkWidget *s_other_button = NULL;
+static GtkWidget *s_last_button = NULL;
 
-    if ( !s_button )
-    {
+static void CreateHeaderButtons()
+{
         // Get the dummy tree widget, give it a column, and then use the
         // widget in the column header for the rendering code.
         GtkWidget* treewidget = GetTreeWidget();
+
         GtkTreeViewColumn *column = gtk_tree_view_column_new();
         gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
-        s_button = column->button;
+        s_first_button = column->button;
+
+        column = gtk_tree_view_column_new();
+        gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
+        s_other_button = column->button;
+
+        column = gtk_tree_view_column_new();
+        gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
+        s_last_button = column->button;
+}
+
+GtkWidget *GetHeaderButtonWidgetFirst()
+{
+    if (!s_first_button)
+      CreateHeaderButtons();
+
+    return s_first_button;
+}
+
+GtkWidget *GetHeaderButtonWidgetLast()
+{
+    if (!s_last_button)
+      CreateHeaderButtons();
+
+    return s_last_button;
+}
+
+GtkWidget *GetHeaderButtonWidget()
+{
+    if (!s_other_button)
+      CreateHeaderButtons();
+
+    return s_other_button;
+}
+
+GtkWidget * GetRadioButtonWidget()
+{
+    static GtkWidget *s_button = NULL;
+    static GtkWidget *s_window = NULL;
+
+    if ( !s_button )
+    {
+        s_window = gtk_window_new( GTK_WINDOW_POPUP );
+        gtk_widget_realize( s_window );
+        s_button = gtk_radio_button_new(NULL);
+        gtk_container_add( GTK_CONTAINER(s_window), s_button );
+        gtk_widget_realize( s_button );
     }
 
     return s_button;
@@ -126,6 +191,23 @@ GtkWidget* GetSplitterWidget()
     return widget;
 }
 
+GtkWidget * GetTextEntryWidget()
+{
+    static GtkWidget *s_button = NULL;
+    static GtkWidget *s_window = NULL;
+
+    if ( !s_button )
+    {
+        s_window = gtk_window_new( GTK_WINDOW_POPUP );
+        gtk_widget_realize( s_window );
+        s_button = gtk_entry_new();
+        gtk_container_add( GTK_CONTAINER(s_window), s_button );
+        gtk_widget_realize( s_button );
+    }
+
+    return s_button;
+}
+
 GtkWidget *GetTreeWidget()
 {
     static GtkWidget *s_tree = NULL;