A few weeks of Unicode fixes (my old win95 laptop compiles sloowly,
especially when through the nullmodem cable). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -75,7 +75,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
|
||||
m_hWnd = (WXHWND)CreateWindowEx
|
||||
(
|
||||
MakeExtendedStyle(m_windowStyle),
|
||||
"BUTTON",
|
||||
_T("BUTTON"),
|
||||
label,
|
||||
WS_VISIBLE | WS_TABSTOP | WS_CHILD,
|
||||
0, 0, 0, 0,
|
||||
@@ -115,7 +115,7 @@ void wxButton::DoSetSize(int x, int y, int width, int height, int sizeFlags)
|
||||
|
||||
int current_width;
|
||||
int cyf;
|
||||
char buf[300];
|
||||
wxChar buf[300];
|
||||
GetWindowText((HWND) GetHWND(), buf, 300);
|
||||
GetTextExtent(buf, ¤t_width, &cyf,NULL,NULL,
|
||||
& this->GetFont());
|
||||
@@ -164,7 +164,7 @@ wxString wxButton::GetLabel(void) const
|
||||
|
||||
void wxButton::SetLabel(const wxString& label)
|
||||
{
|
||||
SetWindowText((HWND) GetHWND(), (const char *) label);
|
||||
SetWindowText((HWND) GetHWND(), (const wxChar *) label);
|
||||
}
|
||||
|
||||
WXHBRUSH wxButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
|
||||
|
Reference in New Issue
Block a user