extending calculation of visible region

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 448cec07ea5d0915306d81e82cb451b1b0271e7a..b25c03c146069bac93d02046fe1019f8547704b1 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "accel.h"
 #endif
 
 #pragma implementation "accel.h"
 #endif
 


@@ -21,32 +21,30 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/msw/private.h"
-#include "wx/msw/accel.h"
+#include "wx/accel.h"

 
 

-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif
+#if wxUSE_ACCEL
+
+#include "wx/msw/private.h"

 
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)

-#endif

 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
     friend class WXDLLEXPORT wxAcceleratorTable;
 public:
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
     friend class WXDLLEXPORT wxAcceleratorTable;
 public:

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

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

+
+    DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)

 };
 
 #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
 };
 
 #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)


@@ -62,7 +60,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
   if (m_hAccel)
   {
     // This function not available in WIN16
   if (m_hAccel)
   {
     // This function not available in WIN16

-#ifndef __WIN16__
+#if !defined(__WIN16__)

     DestroyAcceleratorTable((HACCEL) m_hAccel);
 #endif
   }
     DestroyAcceleratorTable((HACCEL) m_hAccel);
 #endif
   }


@@ -84,14 +82,14 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
     m_refData = new wxAcceleratorRefData;
 
     HACCEL hAccel =
     m_refData = new wxAcceleratorRefData;
 
     HACCEL hAccel =

-#ifdef __WIN32__
+#if defined(__WIN32__)

 #ifdef UNICODE
 #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);


@@ -100,43 +98,51 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
 
 // Create from an array
 extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
 
 // Create from an array

+#if !defined(__WIN16__)

 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     // Not available in WIN16
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     // Not available in WIN16

-#ifndef __WIN16__

     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];
     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];

-    int i;
-    for (i = 0; i < n; i++)
+    for ( int i = 0; i < n; i++ )

     {
     {

+        int flags = entries[i].GetFlags();
+

         BYTE fVirt = 0;
         BYTE fVirt = 0;

-        if (entries[i].m_flags & wxACCEL_ALT)
-            fVirt |= FALT;
-        if (entries[i].m_flags & wxACCEL_SHIFT)
-            fVirt |= FSHIFT;
-        if (entries[i].m_flags & wxACCEL_CTRL)
-            fVirt |= FCONTROL;
+        if ( flags & wxACCEL_ALT )
+            fVirt |= FALT | FVIRTKEY;
+        if ( flags & wxACCEL_SHIFT )
+            fVirt |= FSHIFT | FVIRTKEY;
+        if ( flags & wxACCEL_CTRL )
+            fVirt |= FCONTROL | FVIRTKEY;

 
         bool isVirtual;
 
         bool isVirtual;

-        WORD key = wxCharCodeWXToMSW(entries[i].m_keyCode, & isVirtual);
-        fVirt |= FVIRTKEY;

 
 

-        WORD cmd = entries[i].m_command;
+        WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);
+        if (isVirtual)
+            fVirt |= FVIRTKEY;

 
         arr[i].fVirt = fVirt;
         arr[i].key = key;
 
         arr[i].fVirt = fVirt;
         arr[i].key = key;

-        arr[i].cmd = cmd;
+        arr[i].cmd = entries[i].GetCommand();

     }
 
     M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);
     delete[] arr;
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
     }
 
     M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);
     delete[] arr;
 
     M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);

-#endif

 }
 }

+#else // Win16
+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 // 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));
 }


@@ -156,3 +162,10 @@ 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);
+}
+
+#endif