Compilation for GTK+

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 5be8e518065a023d006c2c96cfbdb9af769c2d37..fa562f68c609927078e011212c7c7b644c1a3b42 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -33,7 +33,6 @@
 #endif
 
 #include <gtk/gtk.h>
 #endif
 
 #include <gtk/gtk.h>

-#include "wx/gtk/win_gtk.h"

 
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
 
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation


@@ -182,6 +181,41 @@ wxRendererGTK::GetTreeWidget()
     return s_tree;
 }
 
     return s_tree;
 }
 

+// used elsewhere
+GtkWidget *GetEntryWidget()
+{
+    static GtkWidget *s_entry = NULL;
+    static GtkWidget *s_window = NULL;
+
+    if ( !s_entry )
+    {
+        s_window = gtk_window_new( GTK_WINDOW_POPUP );
+        gtk_widget_realize( s_window );
+        s_entry = gtk_entry_new();
+        gtk_container_add( GTK_CONTAINER(s_window), s_entry );
+        gtk_widget_realize( s_entry );
+    }
+
+    return s_entry;
+}
+
+// used elsewhere
+GtkWidget *GetScrolledWidget()
+{
+    static GtkWidget *s_entry = NULL;
+    static GtkWidget *s_window = NULL;
+
+    if ( !s_entry )
+    {
+        s_window = gtk_window_new( GTK_WINDOW_POPUP );
+        gtk_widget_realize( s_window );
+        s_entry = gtk_scrolled_window_new( NULL, NULL);
+        gtk_container_add( GTK_CONTAINER(s_window), s_entry );
+        gtk_widget_realize( s_entry );
+    }
+
+    return s_entry;
+}

 
 // 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
 
 // 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


@@ -235,11 +269,20 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
 
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
 

+    GtkStateType state = GTK_STATE_NORMAL;
+    if (flags & wxCONTROL_DISABLED)
+        state = GTK_STATE_INSENSITIVE;
+    else
+    {
+        if (flags & wxCONTROL_CURRENT)
+            state = GTK_STATE_PRELIGHT;
+    }
+

     gtk_paint_box
     (
         button->style,
         gdk_window,
     gtk_paint_box
     (
         button->style,
         gdk_window,

-        flags & wxCONTROL_DISABLED ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL,
+        state,

         GTK_SHADOW_OUT,
         NULL,
         button,
         GTK_SHADOW_OUT,
         NULL,
         button,


@@ -369,21 +412,17 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 
     if ( isVert )
     {
 
     if ( isVert )
     {

-        int h = win->GetClientSize().GetHeight();
-

         rect.x = position;
         rect.y = 0;
         rect.width = full_size;
         rect.x = position;
         rect.y = 0;
         rect.width = full_size;

-        rect.height = h;
+        rect.height = size.y;

     }
     else // horz
     {
     }
     else // horz
     {

-        int w = win->GetClientSize().GetWidth();
-

         rect.x = 0;
         rect.y = position;
         rect.height = full_size;
         rect.x = 0;
         rect.y = position;
         rect.height = full_size;

-        rect.width = w;
+        rect.width = size.x;

     }
 
     int x_diff = 0;
     }
 
     int x_diff = 0;