remove unused/unneeded stuff from gtk/private.h

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

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index 3c690c0d6b0f4066c1cf353810e7cadf2230e384..1ca5e884d9b284c3660d7cf2a0d163cc61291531 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -14,15 +14,8 @@
 
 #include <gtk/gtk.h>
 
-#include "wx/event.h"
 #include "wx/gtk/private/string.h"
 
-// fail all version tests if the GTK+ version is so ancient that it doesn't
-// even have GTK_CHECK_VERSION
-#ifndef GTK_CHECK_VERSION
-    #define GTK_CHECK_VERSION(a, b, c) 0
-#endif
-
 // pango_version_check symbol is quite recent ATM (4/2007)... so we
 // use our own wrapper which implements a smart trick.
 // Use this function as you'd use pango_version_check:
@@ -95,12 +88,7 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro);
 
 // Some deprecated GTK+ prototypes we still use often
 // FIXME: Don't use them if possible.
-G_BEGIN_DECLS
-
-// Should use gtk_image_new, but the mask seems to be handled different,
-// and we need to migrate
-GtkWidget* gtk_pixmap_new (GdkPixmap *pixmap,
-                           GdkBitmap *mask);
+extern "C" {
 
 // Deprecated since GTK+-1.3.7:
 // Trivial wrapper around gtk_window_move, with some side effects we seem to rely on
@@ -114,25 +102,7 @@ void gtk_window_set_policy (GtkWindow *window,
                             gint       allow_grow,
                             gint       auto_shrink);
 
-G_END_DECLS
-
-//-----------------------------------------------------------------------------
-// Misc. functions
-//-----------------------------------------------------------------------------
-
-// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
-void wxAddGrab(wxWindow* window);
-void wxRemoveGrab(wxWindow* window);
-
-// Escapes string so that it is valid Pango markup XML string:
-WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str);
-
-#ifdef __WXGTK20__
-#include <gdk/gdktypes.h>
-
-// Returns stock accelerator modifier and key code for the given ID
-WXDLLEXPORT bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);
-#endif
+} // extern "C"
 
 #endif // _WX_GTK_PRIVATE_H_
 

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 84957d8dbbf9aafa5fc881067f697a7ab6389c40..9e91f09a2a1abe8c966fcd7a4b69058dee981648 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -219,7 +219,7 @@ END_EVENT_TABLE()
 #else
   // __WXGTK20__
 
-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>
 
 static void
 gtk_pseudo_window_realized_callback( GtkWidget *m_widget, void *WXUNUSED(win) )

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index bd79bb96e346408085ae57efe60f22baa736a432..d871eea0ecf53438bb209f0a38c000e9620d5104 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -304,7 +304,7 @@ wxArtProvider::~wxArtProvider()
 }
 
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-    #include "wx/gtk/private.h"
+    #include <gtk/gtk.h>
     extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client);
 #endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
 

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index e0f55864f58e8f15f58e3f754061b10092647c9b..85587d91ffa347da3b38fa3a3b01e2e6736f6274 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -46,11 +46,8 @@ extern "C"
     static void gtk_menu_clicked_callback(GtkWidget *widget, wxMenu *menu);
 }
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
 #if wxUSE_ACCEL
+static bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key);
 static wxString GetGtkHotKey( const wxMenuItem& item );
 #endif
 
@@ -844,7 +841,7 @@ void wxMenuItem::SetItemLabel( const wxString& str )
                                            accel_key,
                                            accel_mods );
     }
-#endif // wxUSE_FILECTRL
+#endif // wxUSE_ACCEL
 }
 
 // NOTE: this function is different from the similar functions GTKProcessMnemonics()
@@ -1176,7 +1173,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
                                         accel_mods,
                                         GTK_ACCEL_VISIBLE);
     }
-#endif // wxUSE_FILECTRL
+#endif // wxUSE_ACCEL
 
     if (pos == -1)
         gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), menuItem);
@@ -1762,6 +1759,8 @@ const char *wxGetStockGtkID(wxWindowID id)
     return NULL;
 }
 
+#if wxUSE_ACCEL
+static
 bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
 {
     if (!id)
@@ -1781,5 +1780,6 @@ bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key)
 
     return false;
 }
+#endif // wxUSE_ACCEL
 
 #endif // wxUSE_MENUS

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 746bb0747d150fe8b0e9b9ea7dec341783bd7184..dde2a7bff9203cf2b12e5fbf29fbdc5465f8e3dd 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -96,41 +96,6 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 }
 #endif
 
-// Escapes string so that it is valid Pango markup XML string:
-wxString wxEscapeStringForPangoMarkup(const wxString& str)
-{
-    size_t len = str.length();
-    wxString out;
-    out.Alloc(len);
-    for (size_t i = 0; i < len; i++)
-    {
-        wxChar c = str[i];
-        switch (c)
-        {
-            case _T('&'):
-                out << _T("&amp;");
-                break;
-            case _T('<'):
-                out << _T("&lt;");
-                break;
-            case _T('>'):
-                out << _T("&gt;");
-                break;
-            case _T('\''):
-                out << _T("&apos;");
-                break;
-            case _T('"'):
-                out << _T("&quot;");
-                break;
-            default:
-                out << c;
-                break;
-        }
-    }
-    return out;
-}
-
-
 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 8f71b6e2eca09a81bb7cce98dc312b9783d014f0..e7ef905f4e9805d03a33c000c396176da2c1a521 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4271,17 +4271,6 @@ wxPoint wxGetMousePosition()
 
 }
 
-// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
-void wxAddGrab(wxWindow* window)
-{
-    gtk_grab_add( (GtkWidget*) window->GetHandle() );
-}
-
-void wxRemoveGrab(wxWindow* window)
-{
-    gtk_grab_remove( (GtkWidget*) window->GetHandle() );
-}
-
 GdkWindow* wxWindowGTK::GTKGetDrawingWindow() const
 {
     GdkWindow* window = NULL;