Include the size of any window borders (size vs. clientsize

[wxWidgets.git] / src / common / wincmn.cpp

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index f906802a0f49a1c0b45d3c5f8d974e7736c03cb2..29a9fa84023cd682bf16da4f830b0d9ff5e609a7 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -85,7 +85,9 @@
 // static data
 // ----------------------------------------------------------------------------
 
 // static data
 // ----------------------------------------------------------------------------
 

-#if defined(__WXPM__)
+#if defined(__WXPALMOS__)
+int wxWindowBase::ms_lastControlId = 32767;
+#elif defined(__WXPM__)

 int wxWindowBase::ms_lastControlId = 2000;
 #else
 int wxWindowBase::ms_lastControlId = -200;
 int wxWindowBase::ms_lastControlId = 2000;
 #else
 int wxWindowBase::ms_lastControlId = -200;


@@ -388,6 +390,7 @@ void wxWindowBase::Centre(int direction)
     int widthParent, heightParent;
 
     wxWindow *parent = NULL;
     int widthParent, heightParent;
 
     wxWindow *parent = NULL;

+    wxTopLevelWindow *winTop = NULL;

 
     if ( !(direction & wxCENTRE_ON_SCREEN) )
     {
 
     if ( !(direction & wxCENTRE_ON_SCREEN) )
     {


@@ -409,9 +412,10 @@ void wxWindowBase::Centre(int direction)
         // Windows, for example, this places it completely off the screen
         if ( parent )
         {
         // Windows, for example, this places it completely off the screen
         if ( parent )
         {

-            wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
+            winTop = wxDynamicCast(parent, wxTopLevelWindow);

             if ( winTop && winTop->IsIconized() )
             {
             if ( winTop && winTop->IsIconized() )
             {

+                winTop = NULL;

                 parent = NULL;
             }
         }
                 parent = NULL;
             }
         }


@@ -434,11 +438,16 @@ void wxWindowBase::Centre(int direction)
     {
         if ( IsTopLevel() )
         {
     {
         if ( IsTopLevel() )
         {

-            // centre on the parent
-            parent->GetSize(&widthParent, &heightParent);
+            if(winTop)
+                winTop->GetRectForTopLevelChildren(&posParent.x, &posParent.y, &widthParent, &heightParent);
+            else
+            {
+                // centre on the parent
+                parent->GetSize(&widthParent, &heightParent);

 
 

-            // adjust to the parents position
-            posParent = parent->GetPosition();
+                // adjust to the parents position
+                posParent = parent->GetPosition();
+            }

         }
         else
         {
         }
         else
         {


@@ -499,7 +508,7 @@ void wxWindowBase::Fit()
 {
     if ( GetChildren().GetCount() > 0 )
     {
 {
     if ( GetChildren().GetCount() > 0 )
     {

-        SetClientSize(GetBestSize());
+        SetSize(GetBestSize());

     }
     //else: do nothing if we have no children
 }
     }
     //else: do nothing if we have no children
 }


@@ -530,7 +539,7 @@ static bool wxHasRealChildren(const wxWindowBase* win)
     return (realChildCount > 0);
 }
 #endif
     return (realChildCount > 0);
 }
 #endif

-    
+

 void wxWindowBase::InvalidateBestSize()
 {
     m_bestSizeCache = wxDefaultSize;
 void wxWindowBase::InvalidateBestSize()
 {
     m_bestSizeCache = wxDefaultSize;


@@ -544,9 +553,11 @@ void wxWindowBase::InvalidateBestSize()
 // return the size best suited for the current window
 wxSize wxWindowBase::DoGetBestSize() const
 {
 // return the size best suited for the current window
 wxSize wxWindowBase::DoGetBestSize() const
 {

+    wxSize best;
+    

     if ( m_windowSizer )
     {
     if ( m_windowSizer )
     {

-        return m_windowSizer->GetMinSize();
+        best = m_windowSizer->GetMinSize();

     }
 #if wxUSE_CONSTRAINTS
     else if ( m_constraints )
     }
 #if wxUSE_CONSTRAINTS
     else if ( m_constraints )


@@ -582,7 +593,7 @@ wxSize wxWindowBase::DoGetBestSize() const
             //       will never return a size bigger than the current one :-(
         }
 
             //       will never return a size bigger than the current one :-(
         }
 

-        return wxSize(maxX, maxY);
+        best = wxSize(maxX, maxY);

     }
 #endif // wxUSE_CONSTRAINTS
     else if ( !GetChildren().empty()
     }
 #endif // wxUSE_CONSTRAINTS
     else if ( !GetChildren().empty()


@@ -634,17 +645,25 @@ wxSize wxWindowBase::DoGetBestSize() const
         maxX += 7;
         maxY += 14;
 
         maxX += 7;
         maxY += 14;
 

-        return wxSize(maxX, maxY);
+        best = wxSize(maxX, maxY);

     }
     else // ! has children
     {
     }
     else // ! has children
     {

-        // for a generic window there is no natural best size - just use either the
-        // minimum size if there is one, or the current size
+        // For a generic window there is no natural best size - just use
+        // either the minimum size if there is one, or the current size.
+        // These are returned as-is, unadjusted by the client size difference.

         if ( GetMinSize().IsFullySpecified() )
             return GetMinSize();
         else
             return GetSize();
     }
         if ( GetMinSize().IsFullySpecified() )
             return GetMinSize();
         else
             return GetSize();
     }

+
+    // Add any difference between size and client size
+    wxSize diff = GetSize() - GetClientSize();
+    best.x += wxMax(0, diff.x);
+    best.y += wxMax(0, diff.y);
+
+    return best;

 }
 
 
 }
 
 


@@ -976,8 +995,15 @@ void wxWindowBase::InheritAttributes()
         if ( parent->m_inheritFgCol && !m_hasFgCol )
             SetForegroundColour(parent->GetForegroundColour());
 
         if ( parent->m_inheritFgCol && !m_hasFgCol )
             SetForegroundColour(parent->GetForegroundColour());
 

+        // inheriting (solid) background colour is wrong as it totally breaks
+        // any kind of themed backgrounds
+        //
+        // instead, the controls should use the same background as their parent
+        // (ideally by not drawing it at all)
+#if 0

         if ( parent->m_inheritBgCol && !m_hasBgCol )
             SetBackgroundColour(parent->GetBackgroundColour());
         if ( parent->m_inheritBgCol && !m_hasBgCol )
             SetBackgroundColour(parent->GetBackgroundColour());

+#endif // 0

     }
 }
 
     }
 }
 


@@ -1212,7 +1238,7 @@ void wxWindowBase::ClearBackground()
 // find child window by id or name
 // ----------------------------------------------------------------------------
 
 // find child window by id or name
 // ----------------------------------------------------------------------------
 

-wxWindow *wxWindowBase::FindWindow( long id )
+wxWindow *wxWindowBase::FindWindow(long id) const

 {
     if ( id == m_windowId )
         return (wxWindow *)this;
 {
     if ( id == m_windowId )
         return (wxWindow *)this;


@@ -1228,7 +1254,7 @@ wxWindow *wxWindowBase::FindWindow( long id )
     return (wxWindow *)res;
 }
 
     return (wxWindow *)res;
 }
 

-wxWindow *wxWindowBase::FindWindow( const wxString& name )
+wxWindow *wxWindowBase::FindWindow(const wxString& name) const

 {
     if ( name == m_windowName )
         return (wxWindow *)this;
 {
     if ( name == m_windowName )
         return (wxWindow *)this;


@@ -1360,7 +1386,7 @@ wxWindowBase::FindWindowByName(const wxString& title, const wxWindow *parent)
 wxWindow *
 wxWindowBase::FindWindowById( long id, const wxWindow* parent )
 {
 wxWindow *
 wxWindowBase::FindWindowById( long id, const wxWindow* parent )
 {

-    return wxFindWindowHelper(parent, _T(""), id, wxFindWindowCmpIds);
+    return wxFindWindowHelper(parent, wxEmptyString, id, wxFindWindowCmpIds);

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


@@ -2019,7 +2045,7 @@ void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) co
 void wxWindowBase::UpdateWindowUI(long flags)
 {
     wxUpdateUIEvent event(GetId());
 void wxWindowBase::UpdateWindowUI(long flags)
 {
     wxUpdateUIEvent event(GetId());

-    event.m_eventObject = this;
+    event.SetEventObject(this);

 
     if ( GetEventHandler()->ProcessEvent(event) )
     {
 
     if ( GetEventHandler()->ProcessEvent(event) )
     {


@@ -2141,7 +2167,7 @@ void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event)
         if ( !win->IsTopLevel() )
         {
             wxSysColourChangedEvent event2;
         if ( !win->IsTopLevel() )
         {
             wxSysColourChangedEvent event2;

-            event.m_eventObject = win;
+            event.SetEventObject(win);

             win->GetEventHandler()->ProcessEvent(event2);
         }
 
             win->GetEventHandler()->ProcessEvent(event2);
         }
 


@@ -2216,7 +2242,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
 #ifdef __WXDEBUG__
                                       _T(" Debug build"),
 #else
 #ifdef __WXDEBUG__
                                       _T(" Debug build"),
 #else

-                                      _T(""),
+                                      wxEmptyString,

 #endif
                                       __TDATE__,
                                       __TTIME__
 #endif
                                       __TDATE__,
                                       __TTIME__


@@ -2679,7 +2705,7 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name)
 #endif
         title = GetWindow()->GetName();
 
 #endif
         title = GetWindow()->GetName();
 

-    if (!title.IsEmpty())
+    if (!title.empty())

     {
         *name = title;
         return wxACC_OK;
     {
         *name = title;
         return wxACC_OK;


@@ -2785,7 +2811,7 @@ wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString*
         return wxACC_FAIL;
 
     wxString ht(GetWindow()->GetHelpText());
         return wxACC_FAIL;
 
     wxString ht(GetWindow()->GetHelpText());

-    if (!ht.IsEmpty())
+    if (!ht.empty())

     {
         *description = ht;
         return wxACC_OK;
     {
         *description = ht;
         return wxACC_OK;


@@ -2801,7 +2827,7 @@ wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* hel
         return wxACC_FAIL;
 
     wxString ht(GetWindow()->GetHelpText());
         return wxACC_FAIL;
 
     wxString ht(GetWindow()->GetHelpText());

-    if (!ht.IsEmpty())
+    if (!ht.empty())

     {
         *helpText = ht;
         return wxACC_OK;
     {
         *helpText = ht;
         return wxACC_OK;