All events now internally watched

[wxWidgets.git] / src / msw / accel.cpp

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index f82e7b7d107c6a862be3150d69c96b09133a6670..c31731046f5f199746040d46088a69fc6d90c2f1 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -38,8 +38,8 @@ class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
     friend class WXDLLEXPORT wxAcceleratorTable;
 public:
 {
     friend class WXDLLEXPORT wxAcceleratorTable;
 public:

-    wxAcceleratorRefData(void);
-    ~wxAcceleratorRefData(void);
+    wxAcceleratorRefData();
+    ~wxAcceleratorRefData();

 
     inline HACCEL GetHACCEL() const { return m_hAccel; }
 protected:
 
     inline HACCEL GetHACCEL() const { return m_hAccel; }
 protected:


@@ -84,12 +84,12 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
     HACCEL hAccel =
 #if defined(__WIN32__) && !defined(__TWIN32__)
 #ifdef UNICODE
     HACCEL hAccel =
 #if defined(__WIN32__) && !defined(__TWIN32__)
 #ifdef UNICODE

-        ::LoadAcceleratorsW(wxGetInstance(), (const char *)resource);
+        ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);

 #else
         ::LoadAcceleratorsA(wxGetInstance(), (const char *)resource);
 #endif
 #else
 #else
         ::LoadAcceleratorsA(wxGetInstance(), (const char *)resource);
 #endif
 #else

-        ::LoadAccelerators(wxGetInstance(), (const char *)resource);
+        ::LoadAccelerators(wxGetInstance(), (const wxChar *)resource);

 #endif
     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_ok = (hAccel != 0);
 #endif
     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_ok = (hAccel != 0);


@@ -132,13 +132,16 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
 }
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
 }

-#else
+#else // Win16

 wxAcceleratorTable::wxAcceleratorTable(int WXUNUSED(n), const wxAcceleratorEntry WXUNUSED(entries)[])
 {
 wxAcceleratorTable::wxAcceleratorTable(int WXUNUSED(n), const wxAcceleratorEntry WXUNUSED(entries)[])
 {

+    // No, we simply gracefully degrade; we don't expect the
+    // developer to pepper their code with #ifdefs just for this.
+    // wxFAIL_MSG("not implemented");

 }
 }

-#endif
+#endif // Win32/16

 
 

-bool wxAcceleratorTable::Ok(void) const
+bool wxAcceleratorTable::Ok() const

 {
     return (M_ACCELDATA && (M_ACCELDATA->m_ok));
 }
 {
     return (M_ACCELDATA && (M_ACCELDATA->m_ok));
 }


@@ -158,3 +161,8 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const
     return (WXHACCEL) M_ACCELDATA->m_hAccel;
 }
 
     return (WXHACCEL) M_ACCELDATA->m_hAccel;
 }
 

+bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
+{
+    MSG *msg = (MSG *)wxmsg;
+
+    return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg); }