Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 5f82d74601d38830f3e6429b133e420de7fe517a..434df30367cd47b2a4da226438ce73791419467a 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        accel.cpp
+// Name:        src/msw/accel.cpp

 // Purpose:     wxAcceleratorTable
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxAcceleratorTable
 // Author:      Julian Smart
 // Modified by:


@@ -9,91 +9,91 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "accel.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_ACCEL
+

 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #endif
 
 #include "wx/accel.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #endif
 
 #include "wx/accel.h"
 

-#if wxUSE_ACCEL
-

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

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

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

+// ----------------------------------------------------------------------------
+// data defining wxAcceleratorTable
+// ----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {

-    friend class WXDLLEXPORT wxAcceleratorTable;
+    friend class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;

 public:
     wxAcceleratorRefData();
 public:
     wxAcceleratorRefData();

-    ~wxAcceleratorRefData();
+    virtual ~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)
+    wxDECLARE_NO_COPY_CLASS(wxAcceleratorRefData);

 };
 
 };
 

+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxAcceleratorRefData
+// ----------------------------------------------------------------------------
+

 #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
 
 wxAcceleratorRefData::wxAcceleratorRefData()
 {
 #define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
 
 wxAcceleratorRefData::wxAcceleratorRefData()
 {

-  m_ok = FALSE;
-  m_hAccel = 0;
+    m_ok = false;
+    m_hAccel = 0;

 }
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {
 }
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {

-  if (m_hAccel)
-  {
-    DestroyAcceleratorTable((HACCEL) m_hAccel);
-  }
-  m_hAccel = 0 ;
-}
-
-wxAcceleratorTable::wxAcceleratorTable()
-{
-  m_refData = NULL;
+    if (m_hAccel)
+    {
+        DestroyAcceleratorTable((HACCEL) m_hAccel);
+    }

 }
 
 }
 

-wxAcceleratorTable::~wxAcceleratorTable()
-{
-}
+// ----------------------------------------------------------------------------
+// wxAcceleratorTable
+// ----------------------------------------------------------------------------

 
 // Load from .rc resource
 wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 {
     m_refData = new wxAcceleratorRefData;
 
 
 // Load from .rc resource
 wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 {
     m_refData = new wxAcceleratorRefData;
 

-    HACCEL hAccel =
-#if defined(__WIN32__)
-#ifdef UNICODE
-        ::LoadAcceleratorsW(wxGetInstance(), (const wxChar *)resource);
-#else
-        ::LoadAcceleratorsA(wxGetInstance(), (const char *)resource);
-#endif
-#else
-        ::LoadAccelerators(wxGetInstance(), (const wxChar *)resource);
-#endif
+    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource.wx_str());

     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_hAccel = hAccel;

-    M_ACCELDATA->m_ok = (hAccel != 0);
+    M_ACCELDATA->m_ok = hAccel != 0;

 }
 
 }
 

-extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
-

 // Create from an array
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {
 // Create from an array
 wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
 {


@@ -104,23 +104,19 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     {
         int flags = entries[i].GetFlags();
 
     {
         int flags = entries[i].GetFlags();
 

-        BYTE fVirt = 0;
+        BYTE fVirt = FVIRTKEY;

         if ( flags & wxACCEL_ALT )
         if ( flags & wxACCEL_ALT )

-            fVirt |= FALT | FVIRTKEY;
+            fVirt |= FALT;

         if ( flags & wxACCEL_SHIFT )
         if ( flags & wxACCEL_SHIFT )

-            fVirt |= FSHIFT | FVIRTKEY;
+            fVirt |= FSHIFT;

         if ( flags & wxACCEL_CTRL )
         if ( flags & wxACCEL_CTRL )

-            fVirt |= FCONTROL | FVIRTKEY;
-
-        bool isVirtual;
+            fVirt |= FCONTROL;

 
 

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

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

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

     }
 
     M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);
     }
 
     M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);


@@ -129,7 +125,7 @@ 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);
 }
 

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

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


@@ -152,7 +148,8 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const
 bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
 {
     MSG *msg = (MSG *)wxmsg;
 bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
 {
     MSG *msg = (MSG *)wxmsg;

-    return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
+    return IsOk() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);

 }
 
 }
 

-#endif
+#endif // wxUSE_ACCEL
+