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

17
src/gtk/settings.cpp
View File

@@ -22,6 +22,7 @@
#include <gtk/gtk.h>
#include "wx/gtk/private/win_gtk.h"
#include "wx/gtk/private/gtk2-compat.h"
bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);
@@ -60,7 +61,7 @@ static const GtkStyle* ButtonStyle()
gtk_widget_ensure_style(s_widget);
g_signal_connect(s_widget, "style_set", G_CALLBACK(style_set), NULL);
}
return s_widget->style;
return gtk_widget_get_style(s_widget);
}
static const GtkStyle* ListStyle()
@@ -73,7 +74,7 @@ static const GtkStyle* ListStyle()
gtk_container_add(ContainerWidget(), s_widget);
gtk_widget_ensure_style(s_widget);
}
return s_widget->style;
return gtk_widget_get_style(s_widget);
}
static const GtkStyle* TextCtrlStyle()
@@ -85,7 +86,7 @@ static const GtkStyle* TextCtrlStyle()
gtk_container_add(ContainerWidget(), s_widget);
gtk_widget_ensure_style(s_widget);
}
return s_widget->style;
return gtk_widget_get_style(s_widget);
}
static const GtkStyle* MenuItemStyle()
@@ -97,7 +98,7 @@ static const GtkStyle* MenuItemStyle()
gtk_container_add(ContainerWidget(), s_widget);
gtk_widget_ensure_style(s_widget);
}
return s_widget->style;
return gtk_widget_get_style(s_widget);
}
static const GtkStyle* MenuBarStyle()
@@ -109,7 +110,7 @@ static const GtkStyle* MenuBarStyle()
gtk_container_add(ContainerWidget(), s_widget);
gtk_widget_ensure_style(s_widget);
}
return s_widget->style;
return gtk_widget_get_style(s_widget);
}
static const GtkStyle* ToolTipStyle()
@@ -124,7 +125,7 @@ static const GtkStyle* ToolTipStyle()
gtk_widget_set_name(s_widget, name);
gtk_widget_ensure_style(s_widget);
}
return s_widget->style;
return gtk_widget_get_style(s_widget);
}
wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
@@ -316,8 +317,8 @@ static int GetBorderWidth(wxSystemMetric index, wxWindow* win)
int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
{
GdkWindow *window = NULL;
if(win && gtk_widget_get_realized(win->GetHandle()))
window = win->GetHandle()->window;
if (win)
window = gtk_widget_get_window(win->GetHandle());
switch (index)
{