expat define MACOS_CLASSIC added

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 959f775c7090eb569a17b0bd631812f677fe144b..dce69059f9b882836d3c9c13ca4798744608ab1e 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -517,11 +517,16 @@ public:
     wxAcceleratorTable *GetAcceleratorTable()
         { return &m_acceleratorTable; }
 
     wxAcceleratorTable *GetAcceleratorTable()
         { return &m_acceleratorTable; }
 

-    // install and deinstall a system wide hotkey
-    virtual bool RegisterHotKey(int hotkeyId, int modifiers, int virtualKeyCode);
+#endif // wxUSE_ACCEL
+
+#if wxUSE_HOTKEY
+    // hot keys (system wide accelerators)
+    // -----------------------------------
+
+    virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode);

     virtual bool UnregisterHotKey(int hotkeyId);
     virtual bool UnregisterHotKey(int hotkeyId);

+#endif // wxUSE_HOTKEY

 
 

-#endif // wxUSE_ACCEL

 
     // dialog units translations
     // -------------------------
 
     // dialog units translations
     // -------------------------


@@ -872,7 +877,7 @@ public:
         virtual void OnInternalIdle() {}
 
         // call internal idle recursively
         virtual void OnInternalIdle() {}
 
         // call internal idle recursively

-        void ProcessInternalIdle() ;
+//        void ProcessInternalIdle() ;

 
         // get the handle of the window for the underlying window system: this
         // is only used for wxWin itself or for user code which wants to call
 
         // get the handle of the window for the underlying window system: this
         // is only used for wxWin itself or for user code which wants to call