Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore fixes needed for wxRenderer functions to work with wxGCDC.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-01-20 17:37:00 +00:00
parent 19c7ac3d3b
commit 02f07b1980
1 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/gtk/renderer.cpp
View File

@@ -33,8 +33,10 @@
#include "wx/module.h" #include "wx/module.h"
#endif #endif
#include "wx/dcgraph.h"
#include "wx/gtk/dc.h" #include "wx/gtk/dc.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/gtk/private/win_gtk.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@@ -134,17 +136,25 @@ wxRendererNative& wxRendererNative::GetDefault()
return s_rendererGTK; return s_rendererGTK;
} }
static GdkWindow* wxGetGdkWindowForDC(wxDC& dc) static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
{ {
GdkWindow* gdk_window = NULL; GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
wxDCImpl *impl = dc.GetImpl(); #if wxUSE_GRAPHICS_CONTEXT
wxGTKDCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl ); if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )
if (gtk_impl) gdk_window = WX_PIZZA(win->m_wxwindow)->m_backing_window;
gdk_window = gtk_impl->GetGDKWindow(); else
#else
gdk_window = dc.GetGDKWindow();
#endif #endif
{
#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
}
return gdk_window; return gdk_window;
} }
@@ -163,7 +173,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget(); GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -202,7 +212,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
{ {
GtkWidget *tree = wxGTKPrivate::GetTreeWidget(); GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -268,7 +278,7 @@ wxRendererGTK::DrawSplitterBorder(wxWindow * WXUNUSED(win),
} }
void void
wxRendererGTK::DrawSplitterSash(wxWindow *win, wxRendererGTK::DrawSplitterSash(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxSize& size, const wxSize& size,
wxCoord position, wxCoord position,
@@ -281,7 +291,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
return; return;
} }
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -329,19 +339,19 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
} }
void void
wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win), wxRendererGTK::DrawDropArrow(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags) int flags)
{ {
GtkWidget *button = wxGTKPrivate::GetButtonWidget(); GtkWidget *button = wxGTKPrivate::GetButtonWidget();
// If we give GTK_PIZZA(win->m_wxwindow)->bin_window as // If we give WX_PIZZA(win->m_wxwindow)->bin_window as
// a window for gtk_paint_xxx function, then it won't // a window for gtk_paint_xxx function, then it won't
// work for wxMemoryDC. So that is why we assume wxDC // work for wxMemoryDC. So that is why we assume wxDC
// is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC
// are derived from it) and use its m_window. // are derived from it) and use its m_window.
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -409,14 +419,14 @@ wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win))
} }
void void
wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win), wxRendererGTK::DrawCheckBox(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags ) int flags )
{ {
GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget(); GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -453,14 +463,14 @@ wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
} }
void void
wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win), wxRendererGTK::DrawPushButton(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags) int flags)
{ {
GtkWidget *button = wxGTKPrivate::GetButtonWidget(); GtkWidget *button = wxGTKPrivate::GetButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -493,12 +503,12 @@ wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
} }
void void
wxRendererGTK::DrawItemSelectionRect(wxWindow *win, wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags ) int flags )
{ {
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -552,7 +562,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{ {
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -575,11 +585,11 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i
} }
// Uses the theme to draw the border and fill for something like a wxTextCtrl // Uses the theme to draw the border and fill for something like a wxTextCtrl
void wxRendererGTK::DrawTextCtrl(wxWindow*, wxDC& dc, const wxRect& rect, int flags) void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{ {
GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget(); GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
GtkStateType state = GTK_STATE_NORMAL; GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED ) if ( flags & wxCONTROL_DISABLED )
@@ -607,11 +617,11 @@ void wxRendererGTK::DrawTextCtrl(wxWindow*, wxDC& dc, const wxRect& rect, int fl
} }
// Draw the equivallent of a wxComboBox // Draw the equivallent of a wxComboBox
void wxRendererGTK::DrawComboBox(wxWindow*, wxDC& dc, const wxRect& rect, int flags) void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{ {
GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget(); GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
GtkStateType state = GTK_STATE_NORMAL; GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED ) if ( flags & wxCONTROL_DISABLED )
@@ -690,11 +700,11 @@ void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc,
// Draw a themed radio button // Draw a themed radio button
void wxRendererGTK::DrawRadioButton(wxWindow*, wxDC& dc, const wxRect& rect, int flags) void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{ {
GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget(); GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
GtkShadowType shadow_type = GTK_SHADOW_OUT; GtkShadowType shadow_type = GTK_SHADOW_OUT;
if ( flags & wxCONTROL_CHECKED ) if ( flags & wxCONTROL_CHECKED )