add wxMBConvStrictUTF8 class implementing just UTF-8 conversion, without support...

[wxWidgets.git] / src / univ / themes / win32.cpp

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 12b176ac044dbfefd0f3f632dc9e5534293fed76..3603333f2bca8e8fa47654eace0559eeefe868bc 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -3196,10 +3196,9 @@ bool wxWin32InputHandler::HandleMouse(wxInputConsumer *control,
     // clicking on the control gives it focus
     if ( event.ButtonDown() )
     {
     // clicking on the control gives it focus
     if ( event.ButtonDown() )
     {

-        wxWindow *win = control->GetInputWindow();
+        wxWindow * const win = control->GetInputWindow();

 
 

-        if ( (wxWindow::FindFocus() != control->GetInputWindow()) &&
-             win->AcceptsFocus() )
+        if ( win->CanAcceptFocus() && wxWindow::FindFocus() != win )

         {
             win->SetFocus();
 
         {
             win->SetFocus();