don't crash when trying to dump struct members which are NULL pointers

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 680ec4e770561e1ec76f42a9a3a046d97c89c4ce..02bdacf2891099ba2b633cc81d8ec84c4cfa1d43 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -9,135 +9,142 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// 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
 #ifndef WX_PRECOMP

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

 #endif
 
 #endif
 

+#include "wx/accel.h"
+

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

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

 
 

-#ifdef LoadAccelerators
-#undef LoadAccelerators
-#endif
+extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual);

 
 

-#if !USE_SHARED_LIBRARIES

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

-#endif
+
+// ----------------------------------------------------------------------------
+// data defining wxAcceleratorTable
+// ----------------------------------------------------------------------------

 
 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)

 };
 
 };
 

+// ============================================================================
+// 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)
-  {
-    // This function not available in WIN16
-#ifndef __WIN16__
-    DestroyAcceleratorTable((HACCEL) m_hAccel);
-#endif
-  }
-  m_hAccel = 0 ;
+    if (m_hAccel)
+    {
+        DestroyAcceleratorTable((HACCEL) m_hAccel);
+    }

 }
 
 }
 

-wxAcceleratorTable::wxAcceleratorTable()
-{
-  m_refData = NULL;
-}
-
-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 =
-#ifdef __WIN32__
-#ifdef UNICODE
-        ::LoadAcceleratorsW(wxGetInstance(), (const char *)resource);
-#else
-        ::LoadAcceleratorsA(wxGetInstance(), (const char *)resource);
-#endif
-#else
-        ::LoadAccelerators(wxGetInstance(), (const char *)resource);
-#endif
+    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource);

     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[])
 {

-    // 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 = (WORD)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

 }
 
 }
 

-bool wxAcceleratorTable::Ok(void) const
+bool wxAcceleratorTable::operator==(const wxAcceleratorTable& accel) const
+{
+    const wxAcceleratorRefData *
+        accelData = (wxAcceleratorRefData *)accel.m_refData;
+
+    return m_refData ? (accelData &&
+                           M_ACCELDATA->m_hAccel == accelData->m_hAccel)
+                     : !accelData;
+}
+
+bool wxAcceleratorTable::Ok() const

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


@@ -157,3 +164,11 @@ 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 // wxUSE_ACCEL
+