call Show(false) from ~wxDialog to call EndModal if the dialog is still modal consist...

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 3fd5b8722514eb9cd2148e3d6043d0605de79116..de54e0aea2559734b5c10479cb269251780b43c4 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -30,10 +30,12 @@
     #include "wx/window.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/window.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

+#include "wx/gtk/dc.h"
+

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

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

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


@@ -92,11 +94,14 @@ public:
                                        const wxRect& rect,
                                        int flags = 0);
 
                                        const wxRect& rect,
                                        int flags = 0);
 

+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+

     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 

-private:
-    // FIXME: shouldn't we destroy these windows somewhere?
+    class Module;
+    friend class Module;

 
 

+private:

     // used by DrawPushButton and DrawDropArrow
     static GtkWidget *GetButtonWidget();
 
     // used by DrawPushButton and DrawDropArrow
     static GtkWidget *GetButtonWidget();
 


@@ -108,12 +113,41 @@ private:
 
     // Used by DrawHeaderButton
     static GtkWidget *GetHeaderButtonWidget();
 
     // Used by DrawHeaderButton
     static GtkWidget *GetHeaderButtonWidget();

+
+    static GtkWidget* GetSplitterWidget();
+
+    // container for created widgets
+    static GtkContainer* GetContainer();
+    static GtkWidget* ms_container;

 };
 
 };
 

+// Module for destroying created widgets
+class wxRendererGTK::Module: public wxModule
+{
+public:
+    virtual bool OnInit()
+    {
+        return true;
+    }
+    virtual void OnExit()
+    {
+        if (wxRendererGTK::ms_container)
+        {
+            GtkWidget* parent =
+                gtk_widget_get_parent(wxRendererGTK::ms_container);
+            gtk_widget_destroy(parent);
+        }
+    }
+    DECLARE_DYNAMIC_CLASS(wxRendererGTK::Module)
+};
+IMPLEMENT_DYNAMIC_CLASS(wxRendererGTK::Module, wxModule)
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

+GtkWidget* wxRendererGTK::ms_container;
+

 /* static */
 wxRendererNative& wxRendererNative::GetDefault()
 {
 /* static */
 wxRendererNative& wxRendererNative::GetDefault()
 {


@@ -126,18 +160,26 @@ wxRendererNative& wxRendererNative::GetDefault()
 // helper functions
 // ----------------------------------------------------------------------------
 
 // helper functions
 // ----------------------------------------------------------------------------
 

+GtkContainer* wxRendererGTK::GetContainer()
+{
+    if (ms_container == NULL)
+    {
+        GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP);
+        ms_container = gtk_fixed_new();
+        gtk_container_add(GTK_CONTAINER(window), ms_container);
+    }
+    return GTK_CONTAINER(ms_container);
+}
+

 GtkWidget *
 wxRendererGTK::GetButtonWidget()
 {
     static GtkWidget *s_button = NULL;
 GtkWidget *
 wxRendererGTK::GetButtonWidget()
 {
     static GtkWidget *s_button = NULL;

-    static GtkWidget *s_window = NULL;

 
     if ( !s_button )
     {
 
     if ( !s_button )
     {

-        s_window = gtk_window_new( GTK_WINDOW_POPUP );
-        gtk_widget_realize( s_window );

         s_button = gtk_button_new();
         s_button = gtk_button_new();

-        gtk_container_add( GTK_CONTAINER(s_window), s_button );
+        gtk_container_add(GetContainer(), s_button);

         gtk_widget_realize( s_button );
     }
 
         gtk_widget_realize( s_button );
     }
 


@@ -148,14 +190,11 @@ GtkWidget *
 wxRendererGTK::GetCheckButtonWidget()
 {
     static GtkWidget *s_button = NULL;
 wxRendererGTK::GetCheckButtonWidget()
 {
     static GtkWidget *s_button = NULL;

-    static GtkWidget *s_window = NULL;

 
     if ( !s_button )
     {
 
     if ( !s_button )
     {

-        s_window = gtk_window_new( GTK_WINDOW_POPUP );
-        gtk_widget_realize( s_window );

         s_button = gtk_check_button_new();
         s_button = gtk_check_button_new();

-        gtk_container_add( GTK_CONTAINER(s_window), s_button );
+        gtk_container_add(GetContainer(), s_button);

         gtk_widget_realize( s_button );
     }
 
         gtk_widget_realize( s_button );
     }
 


@@ -166,24 +205,38 @@ GtkWidget *
 wxRendererGTK::GetTreeWidget()
 {
     static GtkWidget *s_tree = NULL;
 wxRendererGTK::GetTreeWidget()
 {
     static GtkWidget *s_tree = NULL;

-    static GtkWidget *s_window = NULL;

 
     if ( !s_tree )
     {
         s_tree = gtk_tree_view_new();
 
     if ( !s_tree )
     {
         s_tree = gtk_tree_view_new();

-        s_window = gtk_window_new( GTK_WINDOW_POPUP );
-        gtk_widget_realize( s_window );
-        gtk_container_add( GTK_CONTAINER(s_window), s_tree );
+        gtk_container_add(GetContainer(), s_tree);

         gtk_widget_realize( s_tree );
     }
 
     return s_tree;
 }
 
         gtk_widget_realize( 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;
+}

 
 

-// This one just makes a button be a child of a tree widget.  This is
-// apparently how gtk themes decide to draw column headers differently than
-// normal buttons.
+// 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 *
 wxRendererGTK::GetHeaderButtonWidget()
 {
 GtkWidget *
 wxRendererGTK::GetHeaderButtonWidget()
 {


@@ -191,15 +244,29 @@ wxRendererGTK::GetHeaderButtonWidget()
 
     if ( !s_button )
     {
 
     if ( !s_button )
     {

+        // 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();
         GtkWidget* treewidget = GetTreeWidget();

-        s_button = gtk_button_new();
-        gtk_widget_set_parent( s_button, treewidget );
-        gtk_widget_realize( s_button );
+        GtkTreeViewColumn*  column = gtk_tree_view_column_new();
+        gtk_tree_view_append_column(GTK_TREE_VIEW(treewidget), column);
+        s_button = column->button;

     }
 
     return s_button;
 }
 
     }
 
     return s_button;
 }
 

+GtkWidget* wxRendererGTK::GetSplitterWidget()
+{
+    static GtkWidget* widget;
+    if (widget == NULL)
+    {
+        widget = gtk_vpaned_new();
+        gtk_container_add(GetContainer(), widget);
+        gtk_widget_realize(widget);
+    }
+    return widget;
+}
+

 // ----------------------------------------------------------------------------
 // list/tree controls drawing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // list/tree controls drawing
 // ----------------------------------------------------------------------------


@@ -214,8 +281,16 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 {
 
     GtkWidget *button = GetHeaderButtonWidget();
 {
 
     GtkWidget *button = GetHeaderButtonWidget();

-    
-    GdkWindow* gdk_window = dc.GetGDKWindow();
+
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 


@@ -223,11 +298,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,


@@ -245,7 +329,15 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
 {
     GtkWidget *tree = GetTreeWidget();
 
 {
     GtkWidget *tree = GetTreeWidget();
 

-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 


@@ -281,14 +373,10 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 

-static int GetGtkSplitterFullSize()
+static int GetGtkSplitterFullSize(GtkWidget* widget)

 {
 {

-    static GtkWidget *s_paned = NULL;
-    if (s_paned == NULL)
-        s_paned = gtk_vpaned_new();
-

     gint handle_size;
     gint handle_size;

-    gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL);
+    gtk_widget_style_get(widget, "handle_size", &handle_size, NULL);

 
     return handle_size;
 }
 
     return handle_size;
 }


@@ -299,7 +387,7 @@ wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win))
     // we don't draw any border, hence 0 for the second field
     return wxSplitterRenderParams
            (
     // we don't draw any border, hence 0 for the second field
     return wxSplitterRenderParams
            (

-               GetGtkSplitterFullSize(),
+               GetGtkSplitterFullSize(GetSplitterWidget()),

                0,
                true     // hot sensitive
            );
                0,
                true     // hot sensitive
            );


@@ -328,11 +416,19 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         return;
     }
 
         return;
     }
 

-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 

-    wxCoord full_size = GetGtkSplitterFullSize();
+    wxCoord full_size = GetGtkSplitterFullSize(GetSplitterWidget());

 
     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;
 
     // are we drawing vertical or horizontal splitter?
     const bool isVert = orient == wxVERTICAL;


@@ -341,21 +437,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;


@@ -392,7 +484,15 @@ wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),
     // work for wxMemoryDC. So that is why we assume wxDC
     // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC
     // are derived from it) and use its m_window.
     // work for wxMemoryDC. So that is why we assume wxDC
     // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC
     // are derived from it) and use its m_window.

-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 


@@ -454,8 +554,15 @@ wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
 {
     GtkWidget *button = GetCheckButtonWidget();
 
 {
     GtkWidget *button = GetCheckButtonWidget();
 

-    // for reason why we do this, see DrawDropArrow
-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 


@@ -493,8 +600,15 @@ wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
 {
     GtkWidget *button = GetButtonWidget();
 
 {
     GtkWidget *button = GetButtonWidget();
 

-    // for reason why we do this, see DrawDropArrow
-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 


@@ -529,7 +643,15 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
                                      const wxRect& rect,
                                      int flags )
 {
                                      const wxRect& rect,
                                      int flags )
 {

-    GdkWindow* gdk_window = dc.GetGDKWindow();
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif

     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 
     wxASSERT_MSG( gdk_window,
                   wxT("cannot use wxRendererNative on wxDC of this type") );
 


@@ -561,7 +683,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
         state = GTK_STATE_NORMAL;
     }
 
         state = GTK_STATE_NORMAL;
     }
 

-    if (flags & wxCONTROL_CURRENT)
+    if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED))

     {
         gtk_paint_focus( win->m_widget->style,
                          gdk_window,
     {
         gtk_paint_focus( win->m_widget->style,
                          gdk_window,


@@ -575,3 +697,35 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
                          rect.height );
     }
 }
                          rect.height );
     }
 }

+
+void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    GdkWindow* gdk_window = NULL;
+#if wxUSE_NEW_DC
+    wxDCImpl *impl = dc.GetImpl();
+    wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl );
+    if (gtk_impl)
+        gdk_window = gtk_impl->GetGDKWindow();
+#else
+    gdk_window = dc.GetGDKWindow();
+#endif
+    wxASSERT_MSG( gdk_window,
+                  wxT("cannot use wxRendererNative on wxDC of this type") );
+
+    GtkStateType state;
+    if (flags & wxCONTROL_SELECTED)
+        state = GTK_STATE_SELECTED;
+    else
+        state = GTK_STATE_NORMAL;
+
+    gtk_paint_focus( win->m_widget->style,
+                     gdk_window,
+                     state,
+                     NULL,
+                     win->m_wxwindow,
+                     NULL,
+                     dc.LogicalToDeviceX(rect.x),
+                     dc.LogicalToDeviceY(rect.y),
+                     rect.width,
+                     rect.height );
+}