Don't overwrite status message when restoring it if it changed.

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

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 7c0a375e803e904d49d93fefc9505c69c3aedff2..04cd173fd4afd08d24d64b33bd314de80d1287c3 100644 (file)
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/renderer.cpp
+// Name:        src/gtk1/renderer.cpp

 // Purpose:     implementation of wxRendererNative for wxGTK
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxRendererNative for wxGTK
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -25,23 +25,16 @@
 #endif
 
 #include "wx/renderer.h"
 #endif
 
 #include "wx/renderer.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/win_gtk.h"
-
-#include "wx/window.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"

 
 

-#ifdef __WXGTK20__
-    #include "wx/settings.h"
-#endif // GTK 2.0
-
-#ifdef __WXGTK20__
-    #define WXUNUSED_IN_GTK1(arg) arg
-#else
-    #define WXUNUSED_IN_GTK1(arg)
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/dc.h"

 #endif
 
 #endif
 

+#include <gtk/gtk.h>
+#include "wx/gtk1/win_gtk.h"
+#include "wx/gtk1/dcclient.h"
+

 // RR: After a correction to the orientation of the sash
 //     this doesn't seem to be required anymore and it
 //     seems to confuse some themes so USE_ERASE_RECT=0
 // RR: After a correction to the orientation of the sash
 //     this doesn't seem to be required anymore and it
 //     seems to confuse some themes so USE_ERASE_RECT=0


@@ -55,18 +48,12 @@ class WXDLLEXPORT wxRendererGTK : public wxDelegateRendererNative
 {
 public:
     // draw the header control button (used by wxListCtrl)
 {
 public:
     // draw the header control button (used by wxListCtrl)

-    virtual void DrawHeaderButton(wxWindow *win,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int flags = 0);
-
-#ifdef __WXGTK20__
-    // draw the expanded/collapsed icon for a tree control item
-    virtual void DrawTreeItemButton(wxWindow *win,
-                                    wxDC& dc,
-                                    const wxRect& rect,
-                                    int flags = 0);
-#endif // GTK+ 2.0
+    virtual int DrawHeaderButton(wxWindow *win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int flags = 0,
+                                 wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
+                                 wxHeaderButtonParams* params=NULL);

 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,
 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,


@@ -96,11 +83,6 @@ private:
 
     // used by DrawHeaderButton and DrawComboBoxDropButton
     static GtkWidget *GetButtonWidget();
 
     // used by DrawHeaderButton and DrawComboBoxDropButton
     static GtkWidget *GetButtonWidget();

-
-#ifdef __WXGTK20__
-    // used by DrawTreeItemButton()
-    static GtkWidget *GetTreeWidget();
-#endif // GTK+ 2.0

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -137,37 +119,17 @@ wxRendererGTK::GetButtonWidget()
     return s_button;
 }
 
     return s_button;
 }
 

-#ifdef __WXGTK20__
-
-GtkWidget *
-wxRendererGTK::GetTreeWidget()
-{
-    static GtkWidget *s_tree = NULL;
-    static GtkWidget *s_window = NULL;
-
-    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_widget_realize( s_tree );
-    }
-
-    return s_tree;
-}
-
-#endif // GTK+ 2.0
-

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

-void
+int

 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,

-                                int flags)
+                                int flags,
+                                wxHeaderSortIconType WXUNUSED(sortArrow),
+                                wxHeaderButtonParams* WXUNUSED(params))

 {
 
     GtkWidget *button = GetButtonWidget();
 {
 
     GtkWidget *button = GetButtonWidget();


@@ -183,70 +145,25 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
         NULL,
         button,
         "button",
         NULL,
         button,
         "button",

-        dc.XLOG2DEV(rect.x) -1, rect.y -1, rect.width +2, rect.height +2
+        dc.LogicalToDeviceX(rect.x) -1, rect.y -1, rect.width +2, rect.height +2

     );
     );

-}
-
-#ifdef __WXGTK20__

 
 

-// draw a ">" or "v" button
-void
-wxRendererGTK::DrawTreeItemButton(wxWindow* win,
-                                  wxDC& dc, const wxRect& rect, int flags)
-{
-    GtkWidget *tree = GetTreeWidget();
-
-    GtkStateType state;
-    if ( flags & wxCONTROL_CURRENT )
-        state = GTK_STATE_PRELIGHT;
-    else
-        state = GTK_STATE_NORMAL;
-
-    // VZ: I don't know how to get the size of the expander so as to centre it
-    //     in the given rectangle, +2/3 below is just what looks good here...
-    gtk_paint_expander
-    (
-        tree->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        state,
-        NULL,
-        tree,
-        "treeview",
-        dc.LogicalToDeviceX(rect.x) + 2,
-        dc.LogicalToDeviceY(rect.y) + 3,
-        flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
-                                   : GTK_EXPANDER_COLLAPSED
-    );
+    return rect.width + 2;

 }
 
 }
 

-#endif // GTK+ 2.0
-

 // ----------------------------------------------------------------------------
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // splitter sash drawing
 // ----------------------------------------------------------------------------
 

-#ifndef __WXGTK20__
-    // the full sash width (should be even)
-    static const wxCoord SASH_SIZE = 8;
+// the full sash width (should be even)
+static const wxCoord SASH_SIZE = 8;

 
 

-    // margin around the sash
-    static const wxCoord SASH_MARGIN = 2;
-#endif // GTK+ 2.x/1.x
+// margin around the sash
+static const wxCoord SASH_MARGIN = 2;

 
 static int GetGtkSplitterFullSize()
 {
 
 static int GetGtkSplitterFullSize()
 {

-#ifdef __WXGTK20__
-    static GtkWidget *s_paned = NULL;
-    if (s_paned == NULL)
-        s_paned = gtk_vpaned_new();
-
-    gint handle_size;
-    gtk_widget_style_get (s_paned, "handle_size", &handle_size, NULL);
-
-    return handle_size;
-#else

     return SASH_SIZE + SASH_MARGIN;
     return SASH_SIZE + SASH_MARGIN;

-#endif

 }
 
 wxSplitterRenderParams
 }
 
 wxSplitterRenderParams


@@ -257,11 +174,7 @@ wxRendererGTK::GetSplitterParams(const wxWindow *WXUNUSED(win))
            (
                GetGtkSplitterFullSize(),
                0,
            (
                GetGtkSplitterFullSize(),
                0,

-#ifdef __WXGTK20__
-               true     // hot sensitive
-#else // GTK+ 1.x

                false    // not
                false    // not

-#endif // GTK+ 2.x/1.x

            );
 }
 
            );
 }
 


@@ -276,11 +189,11 @@ wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win),
 
 void
 wxRendererGTK::DrawSplitterSash(wxWindow *win,
 
 void
 wxRendererGTK::DrawSplitterSash(wxWindow *win,

-                                wxDC& dc,
+                                wxDC& WXUNUSED(dc),

                                 const wxSize& size,
                                 wxCoord position,
                                 wxOrientation orient,
                                 const wxSize& size,
                                 wxCoord position,
                                 wxOrientation orient,

-                                int WXUNUSED_IN_GTK1(flags))
+                                int WXUNUSED(flags))

 {
     if ( !win->m_wxwindow->window )
     {
 {
     if ( !win->m_wxwindow->window )
     {


@@ -350,23 +263,6 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     );
 #endif
 
     );
 #endif
 

-#ifdef __WXGTK20__
-    gtk_paint_handle
-    (
-        win->m_wxwindow->style,
-        GTK_PIZZA(win->m_wxwindow)->bin_window,
-        flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
-        GTK_SHADOW_NONE,
-        NULL /* no clipping */,
-        win->m_wxwindow,
-        "paned",
-        rect.x,
-        rect.y,
-        rect.width,
-        rect.height,
-        isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
-    );
-#else // GTK+ 1.x

 
     // leave some margin before sash itself
     position += SASH_MARGIN / 2;
 
     // leave some margin before sash itself
     position += SASH_MARGIN / 2;


@@ -397,18 +293,17 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         GTK_PIZZA(win->m_wxwindow)->bin_window,
         GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,
         GTK_PIZZA(win->m_wxwindow)->bin_window,
         GTK_STATE_NORMAL,
         GTK_SHADOW_OUT,

-        (GdkRectangle*) NULL,
+        NULL,

         win->m_wxwindow,
         (char *)"paned", // const_cast
         isVert ? position : size.x - 2*SASH_SIZE,
         isVert ? size.y - 2*SASH_SIZE : position,
         SASH_SIZE, SASH_SIZE
     );
         win->m_wxwindow,
         (char *)"paned", // const_cast
         isVert ? position : size.x - 2*SASH_SIZE,
         isVert ? size.y - 2*SASH_SIZE : position,
         SASH_SIZE, SASH_SIZE
     );

-#endif // GTK+ 2.x/1.x

 }
 
 void
 }
 
 void

-wxRendererGTK::DrawDropArrow(wxWindow *win,
+wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),

                              wxDC& dc,
                              const wxRect& rect,
                              int flags)
                              wxDC& dc,
                              const wxRect& rect,
                              int flags)


@@ -420,11 +315,10 @@ wxRendererGTK::DrawDropArrow(wxWindow *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.

-    wxWindowDC& wdc = (wxWindowDC&)dc;
+    wxWindowDCImpl * const impl = wxDynamicCast(dc.GetImpl(), wxWindowDCImpl);
+    wxCHECK_RET( impl, "must have a window DC" );

 
 

-    // only doing debug-time checking here (it should
-    // probably be enough)
-    wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+    GdkWindow* gdk_window = impl->GetGDKWindow();

 
     // draw arrow so that there is even space horizontally
     // on both sides
 
     // draw arrow so that there is even space horizontally
     // on both sides


@@ -451,7 +345,7 @@ wxRendererGTK::DrawDropArrow(wxWindow *win,
     gtk_paint_arrow
     (
         button->style,
     gtk_paint_arrow
     (
         button->style,

-        wdc.m_window,
+        gdk_window,

         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,


@@ -475,8 +369,10 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
     GtkWidget *button = GetButtonWidget();
 
     // for reason why we do this, see DrawDropArrow
     GtkWidget *button = GetButtonWidget();
 
     // for reason why we do this, see DrawDropArrow

-    wxWindowDC& wdc = (wxWindowDC&)dc;
-    wxASSERT ( wdc.IsKindOf(CLASSINFO(wxWindowDC)) );
+    wxWindowDCImpl * const impl = wxDynamicCast(dc.GetImpl(), wxWindowDCImpl);
+    wxCHECK_RET( impl, "must have a window DC" );
+
+    GdkWindow* gdk_window = impl->GetGDKWindow();

 
     // draw button
     GtkStateType state;
 
     // draw button
     GtkStateType state;


@@ -493,7 +389,7 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
     gtk_paint_box
     (
         button->style,
     gtk_paint_box
     (
         button->style,

-        wdc.m_window,
+        gdk_window,

         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,
         state,
         flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
         NULL,


@@ -506,4 +402,3 @@ wxRendererGTK::DrawComboBoxDropButton(wxWindow *win,
     DrawDropArrow(win,dc,rect,flags);
 
 }
     DrawDropArrow(win,dc,rect,flags);
 
 }

-