Increase wxStaticText height in wxMSW to align its text with wxTextCtrl.

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

diff --git a/src/msw/accel.cpp b/src/msw/accel.cpp
index 40924c05281ed9064df67563a75d6b716f4329b1..cce31919c22f798770e20476d4d54c94b46754cb 100644 (file)
--- a/src/msw/accel.cpp
+++ b/src/msw/accel.cpp
@@ -33,8 +33,7 @@
 #include "wx/accel.h"
 
 #include "wx/msw/private.h"
 #include "wx/accel.h"
 
 #include "wx/msw/private.h"

-
-extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual);
+#include "wx/msw/private/keyboard.h"

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


@@ -44,17 +43,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 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);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -90,7 +89,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 {
     m_refData = new wxAcceleratorRefData;
 
 {
     m_refData = new wxAcceleratorRefData;
 

-    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource);
+    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource.wx_str());

     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_ok = hAccel != 0;
 }
     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_ok = hAccel != 0;
 }


@@ -105,19 +104,15 @@ 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;


@@ -130,17 +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::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
+bool wxAcceleratorTable::IsOk() const

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