Applied patch #1190796 (Further accelerator changes).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index 547270a72da9f44657407e29751dcb6498a055f0..e4df8924462741969f23333aa2d434c61930f489 100644 (file)
--- a/src/os2/checkbox.cpp
+++ b/src/os2/checkbox.cpp
@@ -106,7 +106,8 @@ void wxCheckBox::SetLabel(
   const wxString&                   rsLabel
 )
 {
-    ::WinSetWindowText(GetHwnd(), (PSZ)rsLabel.c_str());
+    wxString                         sLabel=::wxPMTextToLabel(rsLabel);
+    ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());
 } // end of wxCheckBox::SetLabel
 
 wxSize wxCheckBox::DoGetBestSize() const

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index d3db1d4e50b1e58616e59694af3bc0e63c38e269..83a67ce7ee1e847d805b4108d6a84e00017ed5df 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -132,9 +132,11 @@ bool wxControl::OS2CreateControl(
         zClass = WC_CONTAINER;
     dwStyle |= WS_VISIBLE;
 
+    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                        ,(PSZ)zClass              // Window class
-                                       ,(PSZ)rsLabel.c_str()     // Initial Text
+                                       ,(PSZ)sLabel.c_str()      // Initial Text
                                        ,(ULONG)dwStyle           // Style flags
                                        ,(LONG)0                  // X pos of origin
                                        ,(LONG)0                  // Y pos of origin

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index e0eaed2b65785f6dd8b8ee460c050b0574dcd9de..3a5f166c6708b8b27359df8e227788d5448d4b69 100644 (file)
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -201,7 +201,7 @@ void wxRadioButton::SetFocus()
     // generates BN_CLICKED which leads to showing another dialog and so on
     // without end!
     //
-    // to aviod this, we drop the pseudo BN_CLICKED events generated when the
+    // to avoid this, we drop the pseudo BN_CLICKED events generated when the
     // button gains focus
     m_bFocusJustSet = TRUE;
 
@@ -212,7 +212,8 @@ void wxRadioButton::SetLabel(
   const wxString&                   rsLabel
 )
 {
-    ::WinSetWindowText((HWND)GetHWND(), (const char *)rsLabel.c_str());
+    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+    ::WinSetWindowText((HWND)GetHWND(), (const char *)sLabel.c_str());
 } // end of wxRadioButton::SetLabel
 
 void wxRadioButton::SetValue(

diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp
index 4febe1ee27b750a262d0f4ab999475531cabc530..bcb0bb2a443a5b17190434621138b5aa18646100 100644 (file)
--- a/src/os2/stattext.cpp
+++ b/src/os2/stattext.cpp
@@ -60,16 +60,19 @@ bool wxStaticText::Create(
 
     long                            lSstyle = 0L;
 
-    lSstyle = WS_VISIBLE | SS_TEXT | DT_VCENTER;
+    lSstyle = WS_VISIBLE | SS_TEXT | DT_VCENTER | DT_MNEMONIC;
     if (m_windowStyle & wxALIGN_CENTRE)
         lSstyle |= DT_CENTER;
     else if (m_windowStyle & wxALIGN_RIGHT)
         lSstyle |= DT_RIGHT;
     else
         lSstyle |= DT_LEFT;
+
+    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                        ,WC_STATIC                // Window class
-                                       ,(PSZ)rsLabel.c_str()     // Initial Text
+                                       ,(PSZ)sLabel.c_str()      // Initial Text
                                        ,(ULONG)lSstyle           // Style flags
                                        ,0L, 0L, 0L, 0L           // Origin -- 0 size
                                        ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
@@ -121,7 +124,7 @@ wxSize wxStaticText::DoGetBestSize() const
     int                             nHeightLineDefault = 0;
     int                             nHeightLine = 0;
     wxString                        sCurLine;
-    bool                            bLastWasAmpersand = FALSE;
+    bool                            bLastWasTilde = FALSE;
 
     for (const wxChar *pc = sText; ; pc++)
     {
@@ -163,16 +166,16 @@ wxSize wxStaticText::DoGetBestSize() const
         else
         {
             //
-            // We shouldn't take into account the '&' which just introduces the
+            // We shouldn't take into account the '~' which just introduces the
             // mnemonic characters and so are not shown on the screen -- except
-            // when it is preceded by another '&' in which case it stands for a
-            // literal ampersand
+            // when it is preceded by another '~' in which case it stands for a
+            // literal tilde
             //
-            if (*pc == _T('&'))
+            if (*pc == _T('~'))
             {
-                if (!bLastWasAmpersand)
+                if (!bLastWasTilde)
                 {
-                    bLastWasAmpersand = TRUE;
+                    bLastWasTilde = TRUE;
 
                     //
                     // Skip the statement adding pc to curLine below
@@ -181,9 +184,9 @@ wxSize wxStaticText::DoGetBestSize() const
                 }
 
                 //
-                // It is a literal ampersand
+                // It is a literal tilde
                 //
-                bLastWasAmpersand = FALSE;
+                bLastWasTilde = FALSE;
             }
             sCurLine += *pc;
         }
@@ -235,7 +238,8 @@ void wxStaticText::SetLabel(
   const wxString&                   rsLabel
 )
 {
-    ::WinSetWindowText(GetHwnd(), (PSZ)rsLabel.c_str());
+    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+    ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());
 
     //
     // Adjust the size of the window to fit to the label unless autoresizing is