projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore setting m_appName broken by recent change (fixes bug 1921954)
[wxWidgets.git]
/
src
/
gtk
/
renderer.cpp
diff --git
a/src/gtk/renderer.cpp
b/src/gtk/renderer.cpp
index 3f32713a4994d8d9706199761384a3dc0fdbe0c8..de54e0aea2559734b5c10479cb269251780b43c4 100644
(file)
--- a/
src/gtk/renderer.cpp
+++ b/
src/gtk/renderer.cpp
@@
-33,6
+33,8
@@
#include "wx/module.h"
#endif
#include "wx/module.h"
#endif
+#include "wx/gtk/dc.h"
+
#include <gtk/gtk.h>
// ----------------------------------------------------------------------------
#include <gtk/gtk.h>
// ----------------------------------------------------------------------------
@@
-282,8
+284,8
@@
wxRendererGTK::DrawHeaderButton(wxWindow *win,
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wx
ImplDC
*impl = dc.GetImpl();
- wxGTK
ImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC
);
+ wx
DCImpl
*impl = dc.GetImpl();
+ wxGTK
DCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl
);
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
@@
-329,8
+331,8
@@
wxRendererGTK::DrawTreeItemButton(wxWindow* win,
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wx
ImplDC
*impl = dc.GetImpl();
- wxGTK
ImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC
);
+ wx
DCImpl
*impl = dc.GetImpl();
+ wxGTK
DCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl
);
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
@@
-416,8
+418,8
@@
wxRendererGTK::DrawSplitterSash(wxWindow *win,
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wx
ImplDC
*impl = dc.GetImpl();
- wxGTK
ImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC
);
+ wx
DCImpl
*impl = dc.GetImpl();
+ wxGTK
DCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl
);
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
@@
-484,8
+486,8
@@
wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),
// are derived from it) and use its m_window.
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
// are derived from it) and use its m_window.
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wx
ImplDC
*impl = dc.GetImpl();
- wxGTK
ImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC
);
+ wx
DCImpl
*impl = dc.GetImpl();
+ wxGTK
DCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl
);
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
@@
-554,8
+556,8
@@
wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wx
ImplDC
*impl = dc.GetImpl();
- wxGTK
ImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC
);
+ wx
DCImpl
*impl = dc.GetImpl();
+ wxGTK
DCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl
);
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
@@
-600,8
+602,8
@@
wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wx
ImplDC
*impl = dc.GetImpl();
- wxGTK
ImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC
);
+ wx
DCImpl
*impl = dc.GetImpl();
+ wxGTK
DCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl
);
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
@@
-643,8
+645,8
@@
wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
{
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
{
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wx
ImplDC
*impl = dc.GetImpl();
- wxGTK
ImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC
);
+ wx
DCImpl
*impl = dc.GetImpl();
+ wxGTK
DCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl
);
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
@@
-700,8
+702,8
@@
void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i
{
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
{
GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC
- wx
ImplDC
*impl = dc.GetImpl();
- wxGTK
ImplDC *gtk_impl = wxDynamicCast( impl, wxGTKImplDC
);
+ wx
DCImpl
*impl = dc.GetImpl();
+ wxGTK
DCImpl *gtk_impl = wxDynamicCast( impl, wxGTKDCImpl
);
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else
if (gtk_impl)
gdk_window = gtk_impl->GetGDKWindow();
#else