Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed label handling (translating for accelerator handling only for relevant

Browse Source 
classes)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-01-04 22:46:06 +00:00
parent 713d144145
commit 37ac8a5f21
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/os2/control.h
View File

@@ -123,6 +123,7 @@ private:
int m_nYComp; int m_nYComp;
wxString m_label; wxString m_label;
WXDWORD m_dwStyle;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; // end of wxControl }; // end of wxControl

16
src/os2/control.cpp
View File

@@ -120,10 +120,16 @@ bool wxControl::OS2CreateControl( const wxChar* zClassname,
zClass = WC_NOTEBOOK; zClass = WC_NOTEBOOK;
else if ((wxStrcmp(zClassname, _T("CONTAINER"))) == 0) else if ((wxStrcmp(zClassname, _T("CONTAINER"))) == 0)
zClass = WC_CONTAINER; zClass = WC_CONTAINER;
dwStyle |= WS_VISIBLE; if ((zClass == WC_STATIC) || (zClass == WC_BUTTON))
dwStyle |= DT_MNEMONIC;
m_dwStyle = dwStyle;
m_label = rsLabel; m_label = rsLabel;
wxString label = ::wxPMTextToLabel(m_label); wxString label;
if (dwStyle & DT_MNEMONIC)
label = ::wxPMTextToLabel(m_label);
else
label = m_label;
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,(PSZ)zClass // Window class ,(PSZ)zClass // Window class
@@ -230,7 +236,11 @@ void wxControl::SetLabel( const wxString& rsLabel )
if(rsLabel != m_label) if(rsLabel != m_label)
{ {
m_label = rsLabel; m_label = rsLabel;
wxString label = ::wxPMTextToLabel(rsLabel); wxString label;
if (m_dwStyle & DT_MNEMONIC)
label = ::wxPMTextToLabel(m_label);
else
label = m_label;
::WinSetWindowText(GetHwnd(), (PSZ)label.c_str()); ::WinSetWindowText(GetHwnd(), (PSZ)label.c_str());
} }
} // end of wxControl::SetLabel } // end of wxControl::SetLabel