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

first round of Intel compiler warning fixes: down from a few thousands just to slightly more than 100

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-25 19:59:19 +00:00
parent bd090f77ee
commit 17a1ebd101
86 changed files with 713 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gtk/settings.cpp
View File

@@ -348,20 +348,20 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget );
if ( !def || !def->font_desc )
def = gtk_widget_get_default_style();
def = gtk_widget_get_default_style();
if ( def && def->font_desc )
{
wxNativeFontInfo info;
info.description =
{
wxNativeFontInfo info;
info.description =
pango_font_description_copy(def->font_desc);
gs_objects.m_fontSystem = wxFont(info);
}
else
{
gs_objects.m_fontSystem = wxFont(info);
}
else
{
GtkSettings *settings = gtk_settings_get_default();
gchar *font_name = NULL;
g_object_get ( settings,
"gtk-font-name",
"gtk-font-name",
&font_name,
NULL);
if (!font_name)
@@ -369,7 +369,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
else
gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name));
g_free (font_name);
}
}
gtk_widget_destroy( widget );
#else
gs_objects.m_fontSystem = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
@@ -387,7 +387,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
{
#ifdef __WXGTK20__
bool success = false;
guchar *data = NULL;
GdkWindow *window = NULL;
if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
@@ -428,15 +428,15 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
if (!gdk_net_wm_supports(gdk_atom_intern("_NET_FRAME_EXTENTS", false)))
return -1;
}
// Get the frame extents from the windowmanager.
// In most cases the top extent is the titlebar, so we use the bottom extent
// for the heights.
Atom type;
gint format;
gulong nitems;
#if GTK_CHECK_VERSION(2,2,0)
if (!gtk_check_version(2,2,0))
{
@@ -650,12 +650,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
{
switch (index)
{
case wxSYS_CAN_ICONIZE_FRAME:
return FALSE;
break;
case wxSYS_CAN_ICONIZE_FRAME:
return FALSE;
case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
return TRUE;
break;
return TRUE;
default:
return FALSE;
}