X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f11220943f14b4bb5190db0dfd0054304f5015c..34636400a0018eba4a1f63dda18cf32e944b959e:/src/msw/button.cpp diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 17f82e6e7f..80e8318503 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -72,31 +72,30 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, else m_windowId = id; - DWORD exStyle = MakeExtendedStyle(m_windowStyle); - HWND wx_button = - CreateWindowEx(exStyle, "BUTTON", label, BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, - 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, - wxGetInstance(), NULL); - -#if wxUSE_CTL3D -// if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS)) -// Ctl3dSubclassCtl(wx_button); -#endif - - m_hWnd = (WXHWND)wx_button; + m_hWnd = (WXHWND)CreateWindowEx + ( + MakeExtendedStyle(m_windowStyle), + "BUTTON", + label, + WS_VISIBLE | WS_TABSTOP | WS_CHILD, + 0, 0, 0, 0, + GetWinHwnd(parent), + (HMENU)m_windowId, + wxGetInstance(), + NULL + ); // Subclass again for purposes of dialog editing mode - SubclassWin((WXHWND)wx_button); + SubclassWin(m_hWnd); SetFont(parent->GetFont()); SetSize(x, y, width, height); - ShowWindow(wx_button, SW_SHOW); return TRUE; } -void wxButton::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxButton::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY);