Fixes for Unicode build.

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index f7270a6617f20ce084c718505b4f8ab882ac1964..15684985fb1d83e1654e3d137d286e2cfb429ac0 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -80,16 +80,6 @@ WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
 // Sound the bell
 WXDLLIMPEXP_BASE void wxBell();
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
-       // Get the state of a key (true if pressed, false if not)
-       // This is generally most useful getting the state of
-       // Caps Lock, Num Lock and Scroll Lock...
-
-       // Note - There is a X11/GTK version which will be here
-       // soon
-       WXDLLIMPEXP_BASE bool wxGetKeyState(wxKeyCode key);
-#endif
-
 // Get OS description as a user-readable string
 WXDLLIMPEXP_BASE wxString wxGetOsDescription();
 
@@ -100,13 +90,20 @@ WXDLLIMPEXP_BASE int wxGetOsVersion(int *majorVsn = (int *) NULL,
 // Return a string with the current date/time
 WXDLLIMPEXP_BASE wxString wxNow();
 
-// Return path where wxWindows is installed (mostly useful in Unices)
+// Return path where wxWidgets is installed (mostly useful in Unices)
 WXDLLIMPEXP_BASE const wxChar *wxGetInstallPrefix();
 // Return path to wxWin data (/usr/share/wx/%{version}) (Unices)
 WXDLLIMPEXP_BASE wxString wxGetDataDir();
 
 
 #if wxUSE_GUI
+
+// Get the state of a key (true if pressed, false if not)
+// This is generally most useful getting the state of
+// the modifier or toggle keys.
+WXDLLEXPORT bool wxGetKeyState(wxKeyCode key);
+
+
 // Don't synthesize KeyUp events holding down a key and producing
 // KeyDown events with autorepeat. On by default and always on
 // in wxMSW.
@@ -496,7 +493,7 @@ WXDLLIMPEXP_BASE bool wxYield();
 WXDLLIMPEXP_BASE bool wxYieldIfNeeded();
 
 // ----------------------------------------------------------------------------
-// Error message functions used by wxWindows (deprecated, use wxLog)
+// Error message functions used by wxWidgets (deprecated, use wxLog)
 // ----------------------------------------------------------------------------
 
 #if WXWIN_COMPATIBILITY_2_2