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

GTK+ 2.0 compilation.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-03-11 20:47:45 +00:00
parent 2b1d737b3e
commit 5ac8ce9e05
2 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gtk/settings.cpp
View File

@@ -371,6 +371,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
bool success = false;
guchar *data = NULL; guchar *data = NULL;
GdkWindow *window = NULL; GdkWindow *window = NULL;
if(win && GTK_WIDGET_REALIZED(win->GetHandle())) if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
@@ -419,9 +421,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
Atom type; Atom type;
gint format; gint format;
gulong nitems; gulong nitems;
gulong bytes_after;
#if GTK_CHECK_VERSION(2,2,0)
if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), 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_WINDOW_XWINDOW(window),
gdk_x11_get_xatom_by_name_for_display ( gdk_x11_get_xatom_by_name_for_display (
gdk_drawable_get_display(window), gdk_drawable_get_display(window),
@@ -431,7 +436,10 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
false, // do not delete property false, // do not delete property
XA_CARDINAL, // 32 bit XA_CARDINAL, // 32 bit
&type, &format, &nitems, &bytes_after, &data &type, &format, &nitems, &bytes_after, &data
) == Success) ) == Success);
}
#endif
if (success)
{ {
int border_return = -1; int border_return = -1;
@@ -573,9 +581,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
Atom type; Atom type;
gint format; gint format;
gulong nitems; gulong nitems;
gulong bytes_after;
if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), #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_WINDOW_XWINDOW(window),
gdk_x11_get_xatom_by_name_for_display ( gdk_x11_get_xatom_by_name_for_display (
gdk_drawable_get_display(window), gdk_drawable_get_display(window),
@@ -585,7 +596,10 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
false, // do not delete property false, // do not delete property
XA_CARDINAL, // 32 bit XA_CARDINAL, // 32 bit
&type, &format, &nitems, &bytes_after, &data &type, &format, &nitems, &bytes_after, &data
) == Success) ) == Success);
}
#endif
if (success)
{ {
int caption_height = -1; int caption_height = -1;

28
src/gtk1/settings.cpp
View File

@@ -371,6 +371,8 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win ) int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
bool success = false;
guchar *data = NULL; guchar *data = NULL;
GdkWindow *window = NULL; GdkWindow *window = NULL;
if(win && GTK_WIDGET_REALIZED(win->GetHandle())) if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
@@ -419,9 +421,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
Atom type; Atom type;
gint format; gint format;
gulong nitems; gulong nitems;
gulong bytes_after;
#if GTK_CHECK_VERSION(2,2,0)
if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), 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_WINDOW_XWINDOW(window),
gdk_x11_get_xatom_by_name_for_display ( gdk_x11_get_xatom_by_name_for_display (
gdk_drawable_get_display(window), gdk_drawable_get_display(window),
@@ -431,7 +436,10 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
false, // do not delete property false, // do not delete property
XA_CARDINAL, // 32 bit XA_CARDINAL, // 32 bit
&type, &format, &nitems, &bytes_after, &data &type, &format, &nitems, &bytes_after, &data
) == Success) ) == Success);
}
#endif
if (success)
{ {
int border_return = -1; int border_return = -1;
@@ -573,9 +581,12 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
Atom type; Atom type;
gint format; gint format;
gulong nitems; gulong nitems;
gulong bytes_after;
if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(window)), #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_WINDOW_XWINDOW(window),
gdk_x11_get_xatom_by_name_for_display ( gdk_x11_get_xatom_by_name_for_display (
gdk_drawable_get_display(window), gdk_drawable_get_display(window),
@@ -585,7 +596,10 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
false, // do not delete property false, // do not delete property
XA_CARDINAL, // 32 bit XA_CARDINAL, // 32 bit
&type, &format, &nitems, &bytes_after, &data &type, &format, &nitems, &bytes_after, &data
) == Success) ) == Success);
}
#endif
if (success)
{ {
int caption_height = -1; int caption_height = -1;