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

avoid deprecated functions and direct struct access

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-03-28 06:27:49 +00:00
parent 989d151ce2
commit 385e8575dd
50 changed files with 535 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gtk/renderer.cpp
View File

@@ -205,7 +205,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
gtk_paint_box
(
button->style,
gtk_widget_get_style(button),
gdk_window,
state,
GTK_SHADOW_OUT,
@@ -260,7 +260,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
// in the given rectangle, +2/3 below is just what looks good here...
gtk_paint_expander
(
tree->style,
gtk_widget_get_style(tree),
gdk_window,
state,
NULL,
@@ -315,7 +315,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win,
wxOrientation orient,
int flags)
{
if ( !win->m_wxwindow->window )
if (gtk_widget_get_window(win->m_wxwindow) == NULL)
{
// window not realized yet
return;
@@ -353,7 +353,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win,
gtk_paint_handle
(
win->m_wxwindow->style,
gtk_widget_get_style(win->m_wxwindow),
gdk_window,
flags & wxCONTROL_CURRENT ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
GTK_SHADOW_NONE,
@@ -409,7 +409,7 @@ wxRendererGTK::DrawDropArrow(wxWindow* win,
// draw arrow on button
gtk_paint_arrow
(
button->style,
gtk_widget_get_style(button),
gdk_window,
state,
flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
@@ -488,7 +488,7 @@ wxRendererGTK::DrawCheckBox(wxWindow* win,
gtk_paint_check
(
button->style,
gtk_widget_get_style(button),
gdk_window,
state,
shadow_type,
@@ -527,7 +527,7 @@ wxRendererGTK::DrawPushButton(wxWindow* win,
gtk_paint_box
(
button->style,
gtk_widget_get_style(button),
gdk_window,
state,
flags & wxCONTROL_PRESSED ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
@@ -559,7 +559,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
// the wxCONTROL_FOCUSED state is deduced
// directly from the m_wxwindow by GTK+
gtk_paint_flat_box(wxGTKPrivate::GetTreeWidget()->style,
gtk_paint_flat_box(gtk_widget_get_style(wxGTKPrivate::GetTreeWidget()),
gdk_window,
GTK_STATE_SELECTED,
GTK_SHADOW_NONE,
@@ -588,7 +588,7 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i
else
state = GTK_STATE_NORMAL;
gtk_paint_focus( win->m_widget->style,
gtk_paint_focus( gtk_widget_get_style(win->m_widget),
gdk_window,
state,
NULL,
@@ -611,14 +611,11 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
if ( flags & wxCONTROL_DISABLED )
state = GTK_STATE_INSENSITIVE;
if (flags & wxCONTROL_CURRENT )
GTK_WIDGET_SET_FLAGS( entry, GTK_HAS_FOCUS );
else
GTK_WIDGET_UNSET_FLAGS( entry, GTK_HAS_FOCUS );
gtk_widget_set_can_focus(entry, (flags & wxCONTROL_CURRENT) != 0);
gtk_paint_shadow
(
entry->style,
gtk_widget_get_style(entry),
gdk_window,
state,
GTK_SHADOW_OUT,
@@ -643,14 +640,11 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
if ( flags & wxCONTROL_DISABLED )
state = GTK_STATE_INSENSITIVE;
if (flags & wxCONTROL_CURRENT )
GTK_WIDGET_SET_FLAGS( combo, GTK_HAS_FOCUS );
else
GTK_WIDGET_UNSET_FLAGS( combo, GTK_HAS_FOCUS );
gtk_widget_set_can_focus(combo, (flags & wxCONTROL_CURRENT) != 0);
gtk_paint_shadow
(
combo->style,
gtk_widget_get_style(combo),
gdk_window,
state,
GTK_SHADOW_OUT,
@@ -672,7 +666,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
gtk_paint_arrow
(
combo->style,
gtk_widget_get_style(combo),
gdk_window,
state,
GTK_SHADOW_OUT,
@@ -693,7 +687,7 @@ void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, in
gtk_paint_box
(
combo->style,
gtk_widget_get_style(combo),
gdk_window,
state,
GTK_SHADOW_ETCHED_OUT,
@@ -740,7 +734,7 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect,
gtk_paint_option
(
button->style,
gtk_widget_get_style(button),
gdk_window,
state,
shadow_type,