extending calculation of visible region

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 0e86f39c36e2a29e6f6e05d526145be79fe15b35..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,12 +21,12 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

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

 #endif
 
 #endif
 

-#include "wx/msw/accel.h"
+#include "wx/accel.h"
+
+#if wxUSE_ACCEL

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -43,6 +43,8 @@ public:
 protected:
     HACCEL      m_hAccel;
     bool        m_ok;
 protected:
     HACCEL      m_hAccel;
     bool        m_ok;

+
+    DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)

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


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

-#if !defined(__WIN16__) && !defined(__TWIN32__)
+#if !defined(__WIN16__)

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


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

-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)

 #ifdef UNICODE
         ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);
 #else
 #ifdef UNICODE
         ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);
 #else


@@ -96,43 +98,34 @@ 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__) && !defined(__TWIN32__) && !defined(__WXWINE__)
+#if !defined(__WIN16__)

 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     // Not available in WIN16
     m_refData = new wxAcceleratorRefData;
 
     ACCEL* arr = new ACCEL[n];
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
     // Not available in WIN16
     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;
-            fVirt |= FVIRTKEY;
-        }
-        if (entries[i].m_flags & wxACCEL_SHIFT)
-        {
-            fVirt |= FSHIFT;
-            fVirt |= FVIRTKEY;
-        }
-        if (entries[i].m_flags & wxACCEL_CTRL)
-        {
-            fVirt |= FCONTROL;
-            fVirt |= FVIRTKEY;
-        }
+        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);
+
+        WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);

         if (isVirtual)
             fVirt |= FVIRTKEY;
 
         if (isVirtual)
             fVirt |= FVIRTKEY;
 

-        WORD cmd = entries[i].m_command;
-

         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);
     }
 
     M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);


@@ -175,3 +168,4 @@ bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
     return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
 }
 
     return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
 }
 

+#endif