X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a094d7ba9913333b49f8561d97b8309d0023663..7848088476db284a94f19eeb24411b45d676ac46:/src/msw/button.cpp diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 7d2a84f198..46d520bcf7 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -183,9 +183,11 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const msStyle |= BS_TOP; if ( style & wxBU_BOTTOM ) msStyle |= BS_BOTTOM; +#ifndef __WXWINCE__ // flat 2d buttons if ( style & wxNO_BORDER ) msStyle |= BS_FLAT; +#endif // __WXWINCE__ #endif // __WIN32__ return msStyle; @@ -433,7 +435,7 @@ bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) return processed; } -long wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +WXLRESULT wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { // when we receive focus, we want to temporary become the default button in // our parent panel so that pressing "Enter" would activate us -- and when