Fix a number of mingw compile errors.

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

diff --git a/src/gtk/private.cpp b/src/gtk/private.cpp
index 795b4b0667cd6d5e3d005522cd29cf40b3a2fc1d..08ebaae77e28a4432fc425c45239028337440061 100644 (file)
--- a/src/gtk/private.cpp
+++ b/src/gtk/private.cpp
@@ -6,7 +6,7 @@
 // Created:     28.06.2008
 // RCS-ID:      $Id$
 // Copyright:   (c) 2008 Marcin Malich <me@malcom.pl>
 // Created:     28.06.2008
 // RCS-ID:      $Id$
 // Copyright:   (c) 2008 Marcin Malich <me@malcom.pl>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -113,21 +113,51 @@ 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.
 // 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();
         // 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);
         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;

 
 

-    return s_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()
 }
 
 GtkWidget * GetRadioButtonWidget()