AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

deprecation fixes, plus some code size reduction and cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2006-10-15 01:10:01 +00:00
parent e338053c00
commit b0ae510a86
1 changed files with 128 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

301
src/gtk/settings.cpp
View File

@ -20,21 +20,16 @@
#include "wx/fontutil.h" #include "wx/fontutil.h"
// Using gtk_list_new, which is deprecated since GTK2 #include <gtk/gtkversion.h>
// Using gtk_object_sink, which is deprecated since GTK+-2.9.0 #if GTK_CHECK_VERSION(2, 9, 0)
#ifdef GTK_DISABLE_DEPRECATED // gtk_object_sink
#undef GTK_DISABLE_DEPRECATED #undef GTK_DISABLE_DEPRECATED
#endif #endif
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gdk/gdkprivate.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#define SHIFT (8*(sizeof(short int)-sizeof(char)))
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxSystemObjects // wxSystemObjects
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -78,8 +73,8 @@ enum wxGtkColourType
}; };
// wxSystemSettings::GetColour() helper: get the colours from a GTK+ // wxSystemSettings::GetColour() helper: get the colours from a GTK+
// widget style, return true if we did get them, false to use defaults // widget style, return true if we did get them
static bool GetColourFromGTKWidget(int& red, int& green, int& blue, static bool GetColourFromGTKWidget(GdkColor& gdkColor,
wxGtkWidgetType type = wxGTK_BUTTON, wxGtkWidgetType type = wxGTK_BUTTON,
GtkStateType state = GTK_STATE_NORMAL, GtkStateType state = GTK_STATE_NORMAL,
wxGtkColourType colour = wxGTK_BG) wxGtkColourType colour = wxGTK_BG)
@ -96,7 +91,8 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
break; break;
case wxGTK_LIST: case wxGTK_LIST:
widget = gtk_list_new(); widget = gtk_tree_view_new_with_model(
(GtkTreeModel*)gtk_list_store_new(1, G_TYPE_INT));
break; break;
case wxGTK_MENUITEM: case wxGTK_MENUITEM:
@ -107,10 +103,9 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
if ( !def ) if ( !def )
def = gtk_widget_get_default_style(); def = gtk_widget_get_default_style();
bool ok; const bool ok = def != NULL;
if ( def ) if (ok)
{ {
GdkColor *col;
switch ( colour ) switch ( colour )
{ {
default: default:
@ -118,27 +113,17 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
// fall through // fall through
case wxGTK_FG: case wxGTK_FG:
col = def->fg; gdkColor = def->fg[state];
break; break;
case wxGTK_BG: case wxGTK_BG:
col = def->bg; gdkColor = def->bg[state];
break; break;
case wxGTK_BASE: case wxGTK_BASE:
col = def->base; gdkColor = def->base[state];
break; break;
} }
red = col[state].red;
green = col[state].green;
blue = col[state].blue;
ok = true;
}
else
{
ok = false;
} }
gtk_widget_destroy( widget ); gtk_widget_destroy( widget );
@ -152,14 +137,23 @@ static void GetTooltipColors()
gtk_tooltips_force_window(tooltips); gtk_tooltips_force_window(tooltips);
gtk_widget_ensure_style(tooltips->tip_window); gtk_widget_ensure_style(tooltips->tip_window);
GdkColor c = tooltips->tip_window->style->bg[GTK_STATE_NORMAL]; GdkColor c = tooltips->tip_window->style->bg[GTK_STATE_NORMAL];
gs_objects.m_colTooltip = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT); gs_objects.m_colTooltip = wxColor(c);
c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL]; c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL];
gs_objects.m_colTooltipText = wxColor(c.red >> SHIFT, c.green >> SHIFT, c.blue >> SHIFT); gs_objects.m_colTooltipText = wxColor(c);
gtk_object_sink(wx_reinterpret_cast(GtkObject*, tooltips)); #if GTK_CHECK_VERSION(2, 9, 0)
if (gtk_check_version(2, 9, 0) == NULL)
g_object_ref_sink(tooltips);
else
#endif
{
gtk_object_sink((GtkObject*)tooltips);
}
} }
wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
{ {
wxColor color;
GdkColor gdkColor;
switch (index) switch (index)
{ {
case wxSYS_COLOUR_SCROLLBAR: case wxSYS_COLOUR_SCROLLBAR:
@ -174,25 +168,22 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
case wxSYS_COLOUR_3DLIGHT: case wxSYS_COLOUR_3DLIGHT:
if (!gs_objects.m_colBtnFace.Ok()) if (!gs_objects.m_colBtnFace.Ok())
{ {
int red, green, blue; gdkColor.red =
if ( !GetColourFromGTKWidget(red, green, blue) ) gdkColor.green = 0;
{ gdkColor.blue = 0x9c40;
red = GetColourFromGTKWidget(gdkColor);
green = 0; gs_objects.m_colBtnFace = wxColor(gdkColor);
blue = 0x9c40;
}
gs_objects.m_colBtnFace = wxColour( red >> SHIFT,
green >> SHIFT,
blue >> SHIFT );
} }
return gs_objects.m_colBtnFace; color = gs_objects.m_colBtnFace;
break;
case wxSYS_COLOUR_WINDOW: case wxSYS_COLOUR_WINDOW:
return *wxWHITE; color = *wxWHITE;
break;
case wxSYS_COLOUR_3DDKSHADOW: case wxSYS_COLOUR_3DDKSHADOW:
return *wxBLACK; color = *wxBLACK;
break;
case wxSYS_COLOUR_GRAYTEXT: case wxSYS_COLOUR_GRAYTEXT:
case wxSYS_COLOUR_BTNSHADOW: case wxSYS_COLOUR_BTNSHADOW:
@ -201,55 +192,48 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
{ {
wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE)); wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
gs_objects.m_colBtnShadow = gs_objects.m_colBtnShadow =
wxColour((unsigned char) (faceColour.Red() * 0.666), wxColour((unsigned char) (faceColour.Red() * 2 / 3),
(unsigned char) (faceColour.Green() * 0.666), (unsigned char) (faceColour.Green() * 2 / 3),
(unsigned char) (faceColour.Blue() * 0.666)); (unsigned char) (faceColour.Blue() * 2 / 3));
} }
color = gs_objects.m_colBtnShadow;
return gs_objects.m_colBtnShadow; break;
case wxSYS_COLOUR_3DHIGHLIGHT: case wxSYS_COLOUR_3DHIGHLIGHT:
//case wxSYS_COLOUR_BTNHIGHLIGHT: //case wxSYS_COLOUR_BTNHIGHLIGHT:
return * wxWHITE; color = *wxWHITE;
break;
case wxSYS_COLOUR_HIGHLIGHT: case wxSYS_COLOUR_HIGHLIGHT:
if (!gs_objects.m_colHighlight.Ok()) if (!gs_objects.m_colHighlight.Ok())
{ {
int red, green, blue; gdkColor.red =
if ( !GetColourFromGTKWidget(red, green, blue, gdkColor.green = 0;
wxGTK_BUTTON, gdkColor.blue = 0x9c40;
GTK_STATE_SELECTED) ) GetColourFromGTKWidget(
{ gdkColor, wxGTK_BUTTON, GTK_STATE_SELECTED);
red = gs_objects.m_colHighlight = wxColour(gdkColor);
green = 0;
blue = 0x9c40;
}
gs_objects.m_colHighlight = wxColour( red >> SHIFT,
green >> SHIFT,
blue >> SHIFT );
} }
return gs_objects.m_colHighlight; color = gs_objects.m_colHighlight;
break;
case wxSYS_COLOUR_LISTBOX: case wxSYS_COLOUR_LISTBOX:
if (!gs_objects.m_colListBox.Ok()) if (!gs_objects.m_colListBox.Ok())
{ {
int red, green, blue; if ( GetColourFromGTKWidget(gdkColor,
if ( GetColourFromGTKWidget(red, green, blue,
wxGTK_LIST, wxGTK_LIST,
GTK_STATE_NORMAL, GTK_STATE_NORMAL,
wxGTK_BASE) ) wxGTK_BASE) )
{ {
gs_objects.m_colListBox = wxColour( red >> SHIFT, gs_objects.m_colListBox = wxColour(gdkColor);
green >> SHIFT,
blue >> SHIFT );
} }
else else
{ {
gs_objects.m_colListBox = wxColour(*wxWHITE); gs_objects.m_colListBox = *wxWHITE;
} }
} }
return gs_objects.m_colListBox; color = gs_objects.m_colListBox;
break;
case wxSYS_COLOUR_MENUTEXT: case wxSYS_COLOUR_MENUTEXT:
case wxSYS_COLOUR_WINDOWTEXT: case wxSYS_COLOUR_WINDOWTEXT:
@ -258,99 +242,92 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
case wxSYS_COLOUR_BTNTEXT: case wxSYS_COLOUR_BTNTEXT:
if (!gs_objects.m_colBtnText.Ok()) if (!gs_objects.m_colBtnText.Ok())
{ {
int red, green, blue; gdkColor.red =
if ( !GetColourFromGTKWidget(red, green, blue, gdkColor.green =
wxGTK_BUTTON, gdkColor.blue = 0;
GTK_STATE_NORMAL, GetColourFromGTKWidget(
wxGTK_FG) ) gdkColor, wxGTK_BUTTON, GTK_STATE_NORMAL, wxGTK_FG);
{ gs_objects.m_colBtnText = wxColour(gdkColor);
red =
green =
blue = 0;
}
gs_objects.m_colBtnText = wxColour( red >> SHIFT,
green >> SHIFT,
blue >> SHIFT );
} }
return gs_objects.m_colBtnText; color = gs_objects.m_colBtnText;
break;
case wxSYS_COLOUR_INFOBK: case wxSYS_COLOUR_INFOBK:
if (!gs_objects.m_colTooltip.Ok()) { if (!gs_objects.m_colTooltip.Ok()) {
GetTooltipColors(); GetTooltipColors();
} }
return gs_objects.m_colTooltip; color = gs_objects.m_colTooltip;
break;
case wxSYS_COLOUR_INFOTEXT: case wxSYS_COLOUR_INFOTEXT:
if (!gs_objects.m_colTooltipText.Ok()) { if (!gs_objects.m_colTooltipText.Ok()) {
GetTooltipColors(); GetTooltipColors();
} }
return gs_objects.m_colTooltipText; color = gs_objects.m_colTooltipText;
break;
case wxSYS_COLOUR_HIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT:
if (!gs_objects.m_colHighlightText.Ok()) if (!gs_objects.m_colHighlightText.Ok())
{ {
wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT); wxColour hclr = GetColour(wxSYS_COLOUR_HIGHLIGHT);
if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200) if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
gs_objects.m_colHighlightText = wxColour(*wxBLACK); gs_objects.m_colHighlightText = *wxBLACK;
else else
gs_objects.m_colHighlightText = wxColour(*wxWHITE); gs_objects.m_colHighlightText = *wxWHITE;
} }
return gs_objects.m_colHighlightText; color = gs_objects.m_colHighlightText;
break;
case wxSYS_COLOUR_APPWORKSPACE: case wxSYS_COLOUR_APPWORKSPACE:
return *wxWHITE; // ? color = *wxWHITE; // ?
break;
case wxSYS_COLOUR_ACTIVECAPTION: case wxSYS_COLOUR_ACTIVECAPTION:
case wxSYS_COLOUR_MENUHILIGHT: case wxSYS_COLOUR_MENUHILIGHT:
if (!gs_objects.m_colMenuItemHighlight.Ok()) if (!gs_objects.m_colMenuItemHighlight.Ok())
{ {
int red, green, blue; gdkColor.red =
if ( !GetColourFromGTKWidget(red, green, blue, gdkColor.green =
wxGTK_MENUITEM, gdkColor.blue = 0;
GTK_STATE_SELECTED, GetColourFromGTKWidget(
wxGTK_BG) ) gdkColor, wxGTK_MENUITEM, GTK_STATE_SELECTED, wxGTK_BG);
{ gs_objects.m_colMenuItemHighlight = wxColour(gdkColor);
red =
green =
blue = 0;
}
gs_objects.m_colMenuItemHighlight = wxColour( red >> SHIFT,
green >> SHIFT,
blue >> SHIFT );
} }
return gs_objects.m_colMenuItemHighlight; color = gs_objects.m_colMenuItemHighlight;
break;
case wxSYS_COLOUR_HOTLIGHT: case wxSYS_COLOUR_HOTLIGHT:
case wxSYS_COLOUR_GRADIENTACTIVECAPTION: case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
case wxSYS_COLOUR_GRADIENTINACTIVECAPTION: case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
// TODO // TODO
return *wxBLACK; color = *wxBLACK;
break;
case wxSYS_COLOUR_MAX: case wxSYS_COLOUR_MAX:
default: default:
wxFAIL_MSG( _T("unknown system colour index") ); wxFAIL_MSG( _T("unknown system colour index") );
color = *wxWHITE;
break;
} }
return *wxWHITE; return color;
} }
wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
{ {
wxFont font;
switch (index) switch (index)
{ {
case wxSYS_OEM_FIXED_FONT: case wxSYS_OEM_FIXED_FONT:
case wxSYS_ANSI_FIXED_FONT: case wxSYS_ANSI_FIXED_FONT:
case wxSYS_SYSTEM_FIXED_FONT: case wxSYS_SYSTEM_FIXED_FONT:
{ font = *wxNORMAL_FONT;
return *wxNORMAL_FONT; break;
}
case wxSYS_ANSI_VAR_FONT: case wxSYS_ANSI_VAR_FONT:
case wxSYS_SYSTEM_FONT: case wxSYS_SYSTEM_FONT:
case wxSYS_DEVICE_DEFAULT_FONT: case wxSYS_DEVICE_DEFAULT_FONT:
case wxSYS_DEFAULT_GUI_FONT: case wxSYS_DEFAULT_GUI_FONT:
{
if (!gs_objects.m_fontSystem.Ok()) if (!gs_objects.m_fontSystem.Ok())
{ {
GtkWidget *widget = gtk_button_new(); GtkWidget *widget = gtk_button_new();
@ -380,19 +357,45 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
} }
gtk_widget_destroy( widget ); gtk_widget_destroy( widget );
} }
return gs_objects.m_fontSystem; font = gs_objects.m_fontSystem;
} break;
default: default:
return wxNullFont; break;
} }
return font;
}
static bool wxXGetWindowProperty(GdkWindow* window, Atom& type, int& format, gulong& nitems, guchar*& data)
{
bool success = false;
#if GTK_CHECK_VERSION(2, 2, 0)
if (gtk_check_version(2, 2, 0) == NULL)
{
gulong bytes_after;
success = XGetWindowProperty(
GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)),
GDK_WINDOW_XWINDOW(window),
gdk_x11_get_xatom_by_name_for_display(
gdk_drawable_get_display(window),
"_NET_FRAME_EXTENTS"),
0, // left, right, top, bottom, CARDINAL[4]/32
G_MAXLONG, // size of long
false, // do not delete property
XA_CARDINAL, // 32 bit
&type, &format, &nitems, &bytes_after, &data
) == Success;
}
#endif
return success;
} }
int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
{ {
bool success = false;
guchar *data = NULL; guchar *data = NULL;
Atom type;
int format;
gulong nitems;
GdkWindow *window = NULL; GdkWindow *window = NULL;
if(win && GTK_WIDGET_REALIZED(win->GetHandle())) if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
window = win->GetHandle()->window; window = win->GetHandle()->window;
@ -434,45 +437,21 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
// Get the frame extents from the windowmanager. // Get the frame extents from the windowmanager.
// In most cases the top extent is the titlebar, so we use the bottom extent // In most cases the top extent is the titlebar, so we use the bottom extent
// for the heights. // for the heights.
if (wxXGetWindowProperty(window, type, format, nitems, data))
Atom type;
gint format;
gulong nitems;
#if GTK_CHECK_VERSION(2,2,0)
if (!gtk_check_version(2,2,0))
{
gulong bytes_after;
success = (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)),
GDK_WINDOW_XWINDOW(window),
gdk_x11_get_xatom_by_name_for_display (
gdk_drawable_get_display(window),
"_NET_FRAME_EXTENTS" ),
0, // left, right, top, bottom, CARDINAL[4]/32
G_MAXLONG, // size of long
false, // do not delete property
XA_CARDINAL, // 32 bit
&type, &format, &nitems, &bytes_after, &data
) == Success);
}
#endif
if (success)
{ {
int border_return = -1; int border_return = -1;
if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 4) && (data)) if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 4) && (data))
{ {
long *borders;
borders = (long*)data;
switch(index) switch(index)
{ {
case wxSYS_BORDER_X: case wxSYS_BORDER_X:
case wxSYS_EDGE_X: case wxSYS_EDGE_X:
case wxSYS_FRAMESIZE_X: case wxSYS_FRAMESIZE_X:
border_return = borders[1]; // width of right extent border_return = int(data[1]); // width of right extent
break; break;
default: default:
border_return = borders[3]; // height of bottom extent border_return = int(data[3]); // height of bottom extent
break; break;
} }
} }
@ -593,37 +572,13 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
// we could check which is the thickest wm border to decide on which side the // we could check which is the thickest wm border to decide on which side the
// titlebar is, but this might lead to interesting behaviours in used code. // titlebar is, but this might lead to interesting behaviours in used code.
// Reconsider when we have a way to report to the user on which side it is. // Reconsider when we have a way to report to the user on which side it is.
if (wxXGetWindowProperty(window, type, format, nitems, data))
Atom type;
gint format;
gulong nitems;
#if GTK_CHECK_VERSION(2,2,0)
if (!gtk_check_version(2,2,0))
{
gulong bytes_after;
success = (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)),
GDK_WINDOW_XWINDOW(window),
gdk_x11_get_xatom_by_name_for_display (
gdk_drawable_get_display(window),
"_NET_FRAME_EXTENTS" ),
0, // left, right, top, bottom, CARDINAL[4]/32
G_MAXLONG, // size of long
false, // do not delete property
XA_CARDINAL, // 32 bit
&type, &format, &nitems, &bytes_after, &data
) == Success);
}
#endif
if (success)
{ {
int caption_height = -1; int caption_height = -1;
if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 3) && (data)) if ((type == XA_CARDINAL) && (format == 32) && (nitems >= 3) && (data))
{ {
long *borders; caption_height = int(data[2]); // top frame extent
borders = (long*)data;
caption_height = borders[2]; // top frame extent
} }
if (data) if (data)