From 393cbb8ff740a9a708a7241e45992ed0bc2797ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 5 Mar 2003 15:58:10 +0000 Subject: [PATCH 1/1] fix compilation for GTK1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/control.cpp | 2 ++ src/gtk1/control.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index 8801219ee3..3c005c4329 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -83,6 +83,7 @@ wxSize wxControl::DoGetBestSize() const return wxSize(req.width, req.height); } +#ifdef __WXGTK20__ wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const { //Format mnemonics properly for GTK2. This can be called from GTK1.x, but @@ -124,6 +125,7 @@ wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const } return label2; } +#endif #endif // wxUSE_CONTROLS diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index 8801219ee3..3c005c4329 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -83,6 +83,7 @@ wxSize wxControl::DoGetBestSize() const return wxSize(req.width, req.height); } +#ifdef __WXGTK20__ wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const { //Format mnemonics properly for GTK2. This can be called from GTK1.x, but @@ -124,6 +125,7 @@ wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const } return label2; } +#endif #endif // wxUSE_CONTROLS -- 2.47.2