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 ce7b2fca18b6f4c5dfca6a4d06a4ce56bace7879..1561c9d470c7085718f58635e4ec6975f2b6cff1 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -1,75 +1,106 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        control.cpp
+// Name:        msw/control.cpp

 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "control.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "control.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_CONTROLS
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/dcclient.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/log.h"
+    #include "wx/settings.h"

 #endif
 
 #include "wx/control.h"
 
 #endif
 
 #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(__TWIN32__))
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 

-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------

 
 

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

 
 

-// Item members
-wxControl::wxControl()
-{
-    m_backgroundColour = *wxWHITE;
-    m_foregroundColour = *wxBLACK;
+// ============================================================================
+// wxControl implementation
+// ============================================================================

 
 

-#if WXWIN_COMPATIBILITY
-    m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
-}
+// ----------------------------------------------------------------------------
+// wxControl ctor/dtor
+// ----------------------------------------------------------------------------

 
 wxControl::~wxControl()
 {
 
 wxControl::~wxControl()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// control window creation
+// ----------------------------------------------------------------------------

 
 

-bool wxControl::Create(wxWindow *parent, wxWindowID id,
+bool wxControl::Create(wxWindow *parent,
+                       wxWindowID id,

                        const wxPoint& pos,
                        const wxPoint& pos,

-                       const wxSize& size, long style,
-                       const wxValidator& validator,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator& wxVALIDATOR_PARAM(validator),

                        const wxString& name)
 {
                        const wxString& name)
 {

-    bool rval = wxWindow::Create(parent, id, pos, size, style, name);
-    if (rval) {
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return false;
+

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-        SetValidator(validator);
+    SetValidator(validator);

 #endif
 #endif

-    }
-    return rval;
+
+    return true;
+}
+
+bool wxControl::MSWCreateControl(const wxChar *classname,
+                                 const wxString& label,
+                                 const wxPoint& pos,
+                                 const wxSize& size)
+{
+    WXDWORD exstyle;
+    WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), &exstyle);
+
+    return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);

 }
 
 bool wxControl::MSWCreateControl(const wxChar *classname,
 }
 
 bool wxControl::MSWCreateControl(const wxChar *classname,


@@ -79,19 +110,34 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  WXDWORD exstyle)
 {
                                  const wxString& label,
                                  WXDWORD exstyle)
 {

-    // VZ: if someone could put a comment here explaining what exactly this is
-    //     needed for, it would be nice...
-    bool want3D;
-

     // if no extended style given, determine it ourselves
     if ( exstyle == (WXDWORD)-1 )
     {
     // if no extended style given, determine it ourselves
     if ( exstyle == (WXDWORD)-1 )
     {

-        exstyle = GetExStyle(style, &want3D);
+        exstyle = 0;
+        (void) MSWGetStyle(GetWindowStyle(), &exstyle);

     }
 
     }
 

-    // all controls have these childs (wxWindows creates all controls visible
-    // by default)
-    style |= WS_CHILD | WS_VISIBLE;
+    // all controls should have this style
+    style |= WS_CHILD;
+
+    // create the control visible if it's currently shown for wxWidgets
+    if ( m_isShown )
+    {
+        style |= WS_VISIBLE;
+    }
+
+    // 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,
+        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);

 
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
 
     m_hWnd = (WXHWND)::CreateWindowEx
                        (


@@ -99,8 +145,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                         classname,          // the kind of control to create
                         label,              // the window name
                         style,              // the window style
                         classname,          // the kind of control to create
                         label,              // the window name
                         style,              // the window style

-                        pos.x, pos.y,       // the window position
-                        size.x, size.y,     //            and size
+                        x, y, w, h,         // the window position and size

                         GetHwndOf(GetParent()),  // parent
                         (HMENU)GetId(),     // child id
                         wxGetInstance(),    // app instance
                         GetHwndOf(GetParent()),  // parent
                         (HMENU)GetId(),     // child id
                         wxGetInstance(),    // app instance


@@ -109,28 +154,56 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 
     if ( !m_hWnd )
     {
 
     if ( !m_hWnd )
     {

-#ifdef __WXDEBUG__
-        wxLogError(wxT("Failed to create a control of class '%s'"), classname);
-#endif // DEBUG
+        wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);
+        wxFAIL_MSG(_T("something is very wrong, CreateWindowEx failed"));

 
 

-        return FALSE;
+        return false;

     }
 
 #if wxUSE_CTL3D
     if ( want3D )
     {
         Ctl3dSubclassCtl(GetHwnd());
     }
 
 #if wxUSE_CTL3D
     if ( want3D )
     {
         Ctl3dSubclassCtl(GetHwnd());

-        m_useCtl3D = TRUE;
+        m_useCtl3D = true;

     }
 #endif // wxUSE_CTL3D
 
     }
 #endif // wxUSE_CTL3D
 

-    // subclass again for purposes of dialog editing mode
+    // install wxWidgets window proc for this window

     SubclassWin(m_hWnd);
 
     SubclassWin(m_hWnd);
 

-    // controls use the same font and colours as their parent dialog by default
+    // set up fonts and colours

     InheritAttributes();
     InheritAttributes();

+    if (!m_hasFont)
+        SetFont(GetDefaultAttributes().font);
+
+    // set the size now if no initial size specified
+    SetInitialBestSize(size);

 
 

-    return TRUE;
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// various accessors
+// ----------------------------------------------------------------------------
+
+wxBorder wxControl::GetDefaultBorder() const
+{
+    // we want to automatically give controls a sunken style (confusingly,
+    // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE
+    // which is not sunken at all under Windows XP -- rather, just the default)
+    return wxBORDER_SUNKEN;
+}
+
+WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    long msStyle = wxWindow::MSWGetStyle(style, exstyle);
+
+    if ( AcceptsFocus() )
+    {
+        msStyle |= WS_TABSTOP;
+    }
+
+    return msStyle;

 }
 
 wxSize wxControl::DoGetBestSize() const
 }
 
 wxSize wxControl::DoGetBestSize() const


@@ -138,18 +211,73 @@ wxSize wxControl::DoGetBestSize() const
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 

-bool wxControl::ProcessCommand(wxCommandEvent& event)
+// This is a helper for all wxControls made with UPDOWN native control.
+// In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
+// WinCE of Smartphones this happens also for native wxTextCtrl,
+// wxChoice and others.
+wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const

 {
 {

-#if WXWIN_COMPATIBILITY
-    if ( m_callback )
-    {
-        (void)(*m_callback)(this, event);
+    // take size according to layout
+    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
+    );

 
 

-        return TRUE;
-    }
+    // correct size as for undocumented MSW variants cases (WinCE and perhaps others)
+    if (bestSize.x==0)
+        bestSize.x = bestSize.y;
+    if (bestSize.y==0)
+        bestSize.y = bestSize.x;
+
+    // double size according to layout
+    if (is_vertical)
+        bestSize.y *= 2;

     else
     else

-#endif // WXWIN_COMPATIBILITY
+        bestSize.x *= 2;
+
+    return bestSize;
+}
+
+/* static */ wxVisualAttributes
+wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    wxVisualAttributes attrs;
+
+    // old school (i.e. not "common") controls use the standard dialog font
+    // by default
+    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+    // most, or at least many, of the controls use the same colours as the
+    // buttons -- others will have to override this (and possibly simply call
+    // GetCompositeControlsDefaultAttributes() from their versions)
+    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT);
+    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+
+    return attrs;
+}

 
 

+// another version for the "composite", i.e. non simple controls
+/* static */ wxVisualAttributes
+wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    wxVisualAttributes attrs;
+    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+
+    return attrs;
+}
+
+// ----------------------------------------------------------------------------
+// message handling
+// ----------------------------------------------------------------------------
+
+bool wxControl::ProcessCommand(wxCommandEvent& event)
+{

     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }
 


@@ -158,10 +286,10 @@ bool wxControl::MSWOnNotify(int idCtrl,
                             WXLPARAM lParam,
                             WXLPARAM* result)
 {
                             WXLPARAM lParam,
                             WXLPARAM* result)
 {

-    wxCommandEvent event(wxEVT_NULL, m_windowId);
-    wxEventType eventType = wxEVT_NULL;
-    NMHDR *hdr1 = (NMHDR*) lParam;
-    switch ( hdr1->code )
+    wxEventType eventType wxDUMMY_INITIALIZE(wxEVT_NULL);
+
+    NMHDR *hdr = (NMHDR*) lParam;
+    switch ( hdr->code )

     {
         case NM_CLICK:
             eventType = wxEVT_COMMAND_LEFT_CLICK;
     {
         case NM_CLICK:
             eventType = wxEVT_COMMAND_LEFT_CLICK;


@@ -195,6 +323,7 @@ bool wxControl::MSWOnNotify(int idCtrl,
             return wxWindow::MSWOnNotify(idCtrl, lParam, result);
     }
 
             return wxWindow::MSWOnNotify(idCtrl, lParam, result);
     }
 

+    wxCommandEvent event(wxEVT_NULL, m_windowId);

     event.SetEventType(eventType);
     event.SetEventObject(this);
 
     event.SetEventType(eventType);
     event.SetEventObject(this);
 


@@ -202,72 +331,57 @@ 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()));
-    int mode = ::SetMapMode(hdc, MM_TEXT);
-
-    ::FillRect(hdc, &rect, hBrush);
-    ::DeleteObject(hBrush);
-    ::SetMapMode(hdc, mode);
-}
-
-WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                               WXUINT message,
-                               WXWPARAM wParam,
-                               WXLPARAM lParam)
-{
-#if wxUSE_CTL3D
-    if ( m_useCtl3D )
+    HDC hdc = (HDC)pDC;
+    if ( m_hasFgCol )

     {
     {

-        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-        return (WXHBRUSH) hbrush;
+        ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));

     }
     }

-#endif // wxUSE_CTL3D

 
 

-    HDC hdc = (HDC)pDC;
-    if (GetParent()->GetTransparentBackground())
-        SetBkMode(hdc, TRANSPARENT);
-    else
-        SetBkMode(hdc, OPAQUE);
-
-    const wxColour& colBack = GetBackgroundColour();
-    ::SetBkColor(hdc, wxColourToRGB(colBack));
-    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+    // 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);

 
 

-    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+        hbr = (WXHBRUSH)brush->GetResourceHandle();
+    }
+    else // use our own background colour and recurse upwards if necessary
+    {
+        hbr = MSWGetBgBrush(pDC);
+    }

 
 

-    return (WXHBRUSH)brush->GetResourceHandle();
+    return hbr;

 }
 
 }
 

-WXDWORD wxControl::GetExStyle(WXDWORD& style, bool *want3D) const
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)

 {
 {

-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, want3D);
+    ::SetBkMode((HDC)pDC, TRANSPARENT);

 
 

-    // Even with extended styles, need to combine with WS_BORDER for them to
-    // look right.
-    if ( *want3D || wxStyleHasBorder(m_windowStyle) )
-        style |= WS_BORDER;
+    return MSWControlColorSolid(pDC);
+}

 
 

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

 }
 
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
 

+// this is used in radiobox.cpp and slider95.cpp and should be removed as soon
+// as it is not needed there any more!
+//

 // Call this repeatedly for several wnds to find the overall size
 // of the widget.
 // Call this repeatedly for several wnds to find the overall size
 // of the widget.

-// Call it initially with -1 for all values in rect.
+// Call it initially with wxDefaultCoord for all values in rect.

 // Keep calling for other widgets, and rect will be modified
 // to calculate largest bounding rectangle.
 void wxFindMaxSize(WXHWND wnd, RECT *rect)
 // Keep calling for other widgets, and rect will be modified
 // to calculate largest bounding rectangle.
 void wxFindMaxSize(WXHWND wnd, RECT *rect)


@@ -295,3 +409,4 @@ void wxFindMaxSize(WXHWND wnd, RECT *rect)
         rect->bottom = bottom;
 }
 
         rect->bottom = bottom;
 }
 

+#endif // wxUSE_CONTROLS