many warnings fixed (from HP-UX compilation log)

[wxWidgets.git] / include / wx / utils.h

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 9e964e7a3dbce39918875ea6c4acc536da682a57..08e4575b5725470b6e083c074f69d0bed9c20deb 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -221,12 +221,17 @@ WXDLLEXPORT wxChar* wxGetUserHome(const wxString& user = wxEmptyString);
 #if wxUSE_GUI // GUI only things from now on
 
 // ----------------------------------------------------------------------------
-// Strip out any menu codes
+// Menu accelerators related things
 // ----------------------------------------------------------------------------
 
 WXDLLEXPORT wxChar* wxStripMenuCodes(wxChar *in, wxChar *out = (wxChar *) NULL);
 WXDLLEXPORT wxString wxStripMenuCodes(const wxString& str);
 
+#if wxUSE_ACCEL
+class WXDLLEXPORT wxAcceleratorEntry;
+WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label);
+#endif // wxUSE_ACCEL
+
 // ----------------------------------------------------------------------------
 // Window search
 // ----------------------------------------------------------------------------
@@ -337,11 +342,15 @@ WXDLLEXPORT void wxRedirectIOToConsole();
 // Display and colorss (X only)
 // ----------------------------------------------------------------------------
 
+#ifdef __WXGTK__
+    void *wxGetDisplay();
+#endif
+
 #ifdef __X__
     WXDisplay *wxGetDisplay();
     bool wxSetDisplay(const wxString& display_name);
     wxString wxGetDisplayName();
-#endif
+#endif // X or GTK+
 
 #ifdef __X__
 
@@ -391,6 +400,13 @@ extern wxNativeFont wxLoadQueryNearestFont(int pointSize,
                                            const wxString &facename,
                                            wxFontEncoding encoding);
 
+// fills xencoding and xregistry with the X font spec parts for the given
+// encoding ('*' if encoding == wxFONTENCODING_SYSTEM) and returns TRUE if any
+// fonts with this encoding exist or FALSE if it's unknown (it does *not* mean
+// that they don't exist!)
+extern bool wxGetXFontEncoding(wxFontEncoding encoding,
+                               wxString *xencoding, wxString *xregistry);
+
 #endif // X || GTK
 
 #endif // wxUSE_GUI