X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2da2f941bbd25599c2c1453204b5f1a4e116ae91..3ef37e7f4ec5f0688a4fb47e530ca2d30a6bb3ed:/include/wx/utils.h

diff --git a/include/wx/utils.h b/include/wx/utils.h
index a6582b7679..f7270a6617 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -16,7 +16,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma interface "utils.h"
 #endif
 
@@ -63,11 +70,6 @@ class WXDLLIMPEXP_BASE wxPoint;
 WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
 #endif
 
-#if WXWIN_COMPATIBILITY_2
-// Matches string one within string two regardless of case
-WXDLLIMPEXP_BASE bool StringMatch(const wxChar *one, const wxChar *two, bool subString = TRUE, bool exact = FALSE);
-#endif
-
 // A shorter way of using strcmp
 #define wxStringEq(s1, s2) (s1 && s2 && (wxStrcmp(s1, s2) == 0))
 
@@ -78,6 +80,16 @@ WXDLLIMPEXP_BASE bool StringMatch(const wxChar *one, const wxChar *two, bool sub
 // 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();
 
@@ -106,15 +118,9 @@ WXDLLEXPORT bool wxSetDetectableAutoRepeat( bool flag );
 
 // Generate a unique ID
 WXDLLEXPORT long wxNewId();
-#if !defined(NewId) && defined(WXWIN_COMPATIBILITY)
-    #define NewId wxNewId
-#endif
 
 // Ensure subsequent IDs don't clash with this one
 WXDLLEXPORT void wxRegisterId(long id);
-#if !defined(RegisterId) && defined(WXWIN_COMPATIBILITY)
-    #define RegisterId wxRegisterId
-#endif
 
 // Return the current ID
 WXDLLEXPORT long wxGetCurrentId();