end label editing if the control loses focus (slightly modified patch 1084592)

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index d00df75d1d312cb3ce3a68eef567328bd64af7eb..1561c9d470c7085718f58635e4ec6975f2b6cff1 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -40,7 +40,12 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+#if wxUSE_NOTEBOOK
+    #include "wx/notebook.h"
+#endif // wxUSE_NOTEBOOK
+

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#include "wx/msw/uxtheme.h"

 
 #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 
 #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
     #include <commctrl.h>


@@ -52,10 +57,6 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 

-BEGIN_EVENT_TABLE(wxControl, wxWindow)
-    EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
-END_EVENT_TABLE()
-

 // ============================================================================
 // wxControl implementation
 // ============================================================================
 // ============================================================================
 // wxControl implementation
 // ============================================================================


@@ -125,11 +126,15 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
         style |= WS_VISIBLE;
     }
 
         style |= WS_VISIBLE;
     }
 

-    // choose the position for the control
+    // choose the position for the control: we have a problem with default size
+    // here as we can't calculate the best size before the control exists
+    // (DoGetBestSize() may need to use m_hWnd), so just choose the minimal
+    // possible but non 0 size because 0 window width/height result in problems
+    // elsewhere

     int x = pos.x == wxDefaultCoord ? 0 : pos.x,
         y = pos.y == wxDefaultCoord ? 0 : pos.y,
     int x = pos.x == wxDefaultCoord ? 0 : pos.x,
         y = pos.y == wxDefaultCoord ? 0 : pos.y,

-        w = size.x == wxDefaultCoord ? 0 : size.x,
-        h = size.y == wxDefaultCoord ? 0 : size.y;
+        w = size.x == wxDefaultCoord ? 1 : size.x,
+        h = size.y == wxDefaultCoord ? 1 : size.y;

 
     // ... and adjust it to account for a possible parent frames toolbar
     AdjustForParentClientOrigin(x, y);
 
     // ... and adjust it to account for a possible parent frames toolbar
     AdjustForParentClientOrigin(x, y);


@@ -213,8 +218,14 @@ wxSize wxControl::DoGetBestSize() const
 wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
 {
     // take size according to layout
 wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const
 {
     // take size according to layout

-    wxSize bestSize(GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
-                    GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL));
+    wxSize bestSize(
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+                    0,GetCharHeight()
+#else
+                    GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
+                    GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
+#endif
+    );

 
     // correct size as for undocumented MSW variants cases (WinCE and perhaps others)
     if (bestSize.x==0)
 
     // correct size as for undocumented MSW variants cases (WinCE and perhaps others)
     if (bestSize.x==0)


@@ -320,60 +331,45 @@ bool wxControl::MSWOnNotify(int idCtrl,
 }
 #endif // Win95
 
 }
 #endif // Win95
 

-void wxControl::OnEraseBackground(wxEraseEvent& event)
+WXHBRUSH wxControl::MSWControlColorSolid(WXHDC pDC, wxColour colBg)

 {
 {

-    // notice that this 'dumb' implementation may cause flicker for some of the
-    // controls in which case they should intercept wxEraseEvent and process it
-    // themselves somehow
-
-    RECT rect;
-    ::GetClientRect(GetHwnd(), &rect);
-
-    HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour()));
-
-    HDC hdc = GetHdcOf((*event.GetDC()));
-
-#ifndef __WXWINCE__
-    int mode = ::SetMapMode(hdc, MM_TEXT);
-#endif
-
-    ::FillRect(hdc, &rect, hBrush);
-    ::DeleteObject(hBrush);
+    HDC hdc = (HDC)pDC;
+    if ( m_hasFgCol )
+    {
+        ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+    }

 
 

-#ifndef __WXWINCE__
-    ::SetMapMode(hdc, mode);
-#endif
-}
+    // use the background colour override if a valid colour is given
+    WXHBRUSH hbr;
+    if ( colBg.Ok() )
+    {
+        // draw children with the same colour as the parent
+        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);

 
 

-WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
-#if wxUSE_CTL3D
-                               WXUINT message,
-                               WXWPARAM wParam,
-                               WXLPARAM lParam
-#else
-                               WXUINT WXUNUSED(message),
-                               WXWPARAM WXUNUSED(wParam),
-                               WXLPARAM WXUNUSED(lParam)
-#endif
-    )
-{
-#if wxUSE_CTL3D
-    if ( m_useCtl3D )
+        hbr = (WXHBRUSH)brush->GetResourceHandle();
+    }
+    else // use our own background colour and recurse upwards if necessary

     {
     {

-        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-        return (WXHBRUSH) hbrush;
+        hbr = MSWGetBgBrush(pDC);

     }
     }

-#endif // wxUSE_CTL3D

 
 

-    HDC hdc = (HDC)pDC;
-    wxColour colBack = GetBackgroundColour();
+    return hbr;
+}

 
 

-    ::SetBkColor(hdc, wxColourToRGB(colBack));
-    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+{
+    ::SetBkMode((HDC)pDC, TRANSPARENT);

 
 

-    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+    return MSWControlColorSolid(pDC);
+}

 
 

-    return (WXHBRUSH)brush->GetResourceHandle();
+WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
+{
+    return MSWControlColorSolid
+           (
+                pDC,
+                wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)
+           );

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------