GTK1 compilation fix from Mart R., followup to patch 1157735

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index b8ace189883fcee87aa847ae5c36c4daa5f980e0..600f0310a949460f5a8cbfed8bbfd3cd4ff7b67f 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -379,6 +379,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 
     switch (index)
     {
 
     switch (index)
     {

+#ifdef __WXGTK20__

         case wxSYS_BORDER_X:
         case wxSYS_BORDER_Y:
         case wxSYS_EDGE_X:
         case wxSYS_BORDER_X:
         case wxSYS_BORDER_Y:
         case wxSYS_EDGE_X:


@@ -460,6 +461,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
             }
 
             return -1; // no window specified
             }
 
             return -1; // no window specified

+#endif // gtk2

 
         case wxSYS_CURSOR_X:
         case wxSYS_CURSOR_Y:
 
         case wxSYS_CURSOR_X:
         case wxSYS_CURSOR_Y:

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index b8ace189883fcee87aa847ae5c36c4daa5f980e0..600f0310a949460f5a8cbfed8bbfd3cd4ff7b67f 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -379,6 +379,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 
     switch (index)
     {
 
     switch (index)
     {

+#ifdef __WXGTK20__

         case wxSYS_BORDER_X:
         case wxSYS_BORDER_Y:
         case wxSYS_EDGE_X:
         case wxSYS_BORDER_X:
         case wxSYS_BORDER_Y:
         case wxSYS_EDGE_X:


@@ -460,6 +461,7 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
             }
 
             return -1; // no window specified
             }
 
             return -1; // no window specified

+#endif // gtk2

 
         case wxSYS_CURSOR_X:
         case wxSYS_CURSOR_Y:
 
         case wxSYS_CURSOR_X:
         case wxSYS_CURSOR_Y: