invalidate best size cache when GTK style changes

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index b265d56be0491b3d236238a604113769fe194710..efe188ffbab931fb57c5fa38a6ee1b07d02252f8 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -9,6 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "control.h"
 #endif
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "control.h"
 #endif


@@ -27,6 +35,7 @@
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/log.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"


@@ -37,42 +46,49 @@
     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 

+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+

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

-// Item members
-wxControl::wxControl()
-{
-#if WXWIN_COMPATIBILITY
-    m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
-}
+// ============================================================================
+// wxControl implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxControl ctor/dtor
+// ----------------------------------------------------------------------------

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

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 }
 
 }
 

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

 
 bool wxControl::Create(wxWindow *parent,
                        wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,
                        long style,
 
 bool wxControl::Create(wxWindow *parent,
                        wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,
                        long style,

-                       const wxValidator& validator,
+                       const wxValidator& wxVALIDATOR_PARAM(validator),

                        const wxString& name)
 {
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
                        const wxString& name)
 {
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )

-        return FALSE;
+        return false;

 
 #if wxUSE_VALIDATORS
     SetValidator(validator);
 #endif
 
 
 #if wxUSE_VALIDATORS
     SetValidator(validator);
 #endif
 

-    return TRUE;
+    return true;

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


@@ -103,16 +119,20 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     // all controls should have this style
     style |= WS_CHILD;
 
     // all controls should have this style
     style |= WS_CHILD;
 

-    // create the control visible if it's currently shown for wxWindows
+    // create the control visible if it's currently shown for wxWidgets

     if ( m_isShown )
     {
         style |= WS_VISIBLE;
     }
 
     if ( m_isShown )
     {
         style |= WS_VISIBLE;
     }
 

-    int x = pos.x == -1 ? 0 : pos.x,
-        y = pos.y == -1 ? 0 : pos.y,
-        w = size.x == -1 ? 0 : size.x,
-        h = size.y == -1 ? 0 : size.y;
+    // choose the position for the control
+    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;
+
+    // ... and adjust it to account for a possible parent frames toolbar
+    AdjustForParentClientOrigin(x, y);

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


@@ -130,34 +150,37 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     if ( !m_hWnd )
     {
         wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);
     if ( !m_hWnd )
     {
         wxLogDebug(wxT("Failed to create a control of class '%s'"), classname);

-        wxFAIL_MSG(_T("something is very wrong"));
+        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
 

-    // install wxWindows window proc for this window
+    // 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
 
     // set the size now if no initial size specified

-    if ( w <= 0 || h <= 0 )
-    {
-        SetBestSize(size);
-    }
+    SetInitialBestSize(size);

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// various accessors
+// ----------------------------------------------------------------------------
+

 wxBorder wxControl::GetDefaultBorder() const
 {
     // we want to automatically give controls a sunken style (confusingly,
 wxBorder wxControl::GetDefaultBorder() const
 {
     // we want to automatically give controls a sunken style (confusingly,


@@ -166,23 +189,79 @@ wxBorder wxControl::GetDefaultBorder() const
     return wxBORDER_SUNKEN;
 }
 
     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
 {
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
 wxSize wxControl::DoGetBestSize() const
 {
     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 )
+    if (is_vertical)

     {
     {

-        (void)(*m_callback)(*this, event);
-
-        return TRUE;
+        // vertical control
+        return wxSize(GetSystemMetrics(SM_CXVSCROLL),
+                      2*GetSystemMetrics(SM_CYVSCROLL));

     }
     else
     }
     else

-#endif // WXWIN_COMPATIBILITY
+    {
+        // horizontal control
+        return wxSize(2*GetSystemMetrics(SM_CXHSCROLL),
+                      GetSystemMetrics(SM_CYHSCROLL));
+    }
+}
+
+/* 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);
 }
 


@@ -191,7 +270,7 @@ bool wxControl::MSWOnNotify(int idCtrl,
                             WXLPARAM lParam,
                             WXLPARAM* result)
 {
                             WXLPARAM lParam,
                             WXLPARAM* result)
 {

-    wxEventType eventType = wxEVT_NULL;
+    wxEventType eventType wxDUMMY_INITIALIZE(wxEVT_NULL);

 
     NMHDR *hdr = (NMHDR*) lParam;
     switch ( hdr->code )
 
     NMHDR *hdr = (NMHDR*) lParam;
     switch ( hdr->code )


@@ -292,25 +371,16 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED
     return (WXHBRUSH)brush->GetResourceHandle();
 }
 
     return (WXHBRUSH)brush->GetResourceHandle();
 }
 

-WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    long msStyle = wxWindow::MSWGetStyle(style, exstyle);
-
-    if ( AcceptsFocus() )
-    {
-        msStyle |= WS_TABSTOP;
-    }
-
-    return msStyle;
-}
-

 // ---------------------------------------------------------------------------
 // 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)