fixes for harmless mingw32 warnings

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

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 87a63e86485090823d2ef93318a184cf8c7ea30b..7dfc0060af07b69ff1b6bcb1b087f63b131f3e2e 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
 // Id:          $Id$
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart

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


@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "toplevelbase.h"
 #endif
 
     #pragma implementation "toplevelbase.h"
 #endif
 


@@ -30,10 +30,9 @@
 #ifndef WX_PRECOMP
     #include "wx/toplevel.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/toplevel.h"
     #include "wx/dcclient.h"

+    #include "wx/app.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/evtloop.h"
-

 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------


@@ -47,10 +46,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-// FIXME: some platforms don't have wxTopLevelWindow yet
-#ifdef wxTopLevelWindowNative
-    IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow)

 
 // ----------------------------------------------------------------------------
 // construction/destruction
 
 // ----------------------------------------------------------------------------
 // construction/destruction


@@ -58,11 +54,25 @@ END_EVENT_TABLE()
 
 wxTopLevelWindowBase::wxTopLevelWindowBase()
 {
 
 wxTopLevelWindowBase::wxTopLevelWindowBase()
 {

+    // Unlike windows, top level windows are created hidden by default.
+    m_isShown = false;

 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()
 {
 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()
 {

-    // this destructor is required for Darwin
+    // don't let wxTheApp keep any stale pointers to us
+    if ( wxTheApp && wxTheApp->GetTopWindow() == this )
+        wxTheApp->SetTopWindow(NULL);
+
+    bool shouldExit = IsLastBeforeExit();
+
+    wxTopLevelWindows.DeleteObject(this);
+    
+    if ( shouldExit )
+    {
+        // then do it
+        wxTheApp->ExitMainLoop();
+    }

 }
 
 bool wxTopLevelWindowBase::Destroy()
 }
 
 bool wxTopLevelWindowBase::Destroy()


@@ -72,9 +82,73 @@ bool wxTopLevelWindowBase::Destroy()
     if ( !wxPendingDelete.Member(this) )
         wxPendingDelete.Append(this);
 
     if ( !wxPendingDelete.Member(this) )
         wxPendingDelete.Append(this);
 

+    if (wxTopLevelWindows.GetCount() > 1)
+    {
+        // Hide it immediately. This should
+        // not be done if this TLW is the
+        // only one left since we then would
+        // risk not to get any idle events
+        // at all anymore during which we 
+        // could delete any pending events.
+        Hide();
+    }
+

     return TRUE;
 }
 
     return TRUE;
 }
 

+bool wxTopLevelWindowBase::IsLastBeforeExit() const
+{
+    // we exit the application if there are no more top level windows left
+    // normally but wxApp can prevent this from happening
+    return wxTopLevelWindows.GetCount() == 1 &&
+            wxTopLevelWindows.GetFirst()->GetData() == (wxWindow *)this &&
+            wxTheApp && wxTheApp->GetExitOnFrameDelete();
+}
+
+// ----------------------------------------------------------------------------
+// wxTopLevelWindow geometry
+// ----------------------------------------------------------------------------
+
+wxSize wxTopLevelWindowBase::GetMaxSize() const
+{
+    wxSize  size( GetMaxWidth(), GetMaxHeight() );
+    int     w, h;
+
+    wxClientDisplayRect( 0, 0, &w, &h );
+
+    if( size.GetWidth() == -1 )
+        size.SetWidth( w );
+
+    if( size.GetHeight() == -1 )
+        size.SetHeight( h );
+
+    return size;
+}
+
+/* static */
+wxSize wxTopLevelWindowBase::GetDefaultSize()
+{
+    wxSize size = wxGetClientDisplayRect().GetSize();
+
+    // create proportionally bigger windows on small screens
+    if ( size.x >= 1024 )
+        size.x = 400;
+    else if ( size.x >= 800 )
+        size.x = 300;
+    else if ( size.x >= 320 )
+        size.x = 240;
+
+    if ( size.y >= 768 )
+        size.y = 250;
+    else if ( size.y > 200 )
+    {
+        size.y *= 2;
+        size.y /= 3;
+    }
+
+    return size;
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindow size management: we exclude the areas taken by
 // menu/status/toolbars from the client area, so the client area is what's
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow size management: we exclude the areas taken by
 // menu/status/toolbars from the client area, so the client area is what's


@@ -115,18 +189,16 @@ void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const
 // whole client area
 void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
 {
 // whole client area
 void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
 {

-    // if we're using constraints - do use them
-#if wxUSE_CONSTRAINTS
+    // if we're using constraints or sizers - do use them

     if ( GetAutoLayout() )
     {
         Layout();
     }
     else
     if ( GetAutoLayout() )
     {
         Layout();
     }
     else

-#endif // wxUSE_CONSTRAINTS

     {
         // do we have _exactly_ one child?
         wxWindow *child = (wxWindow *)NULL;
     {
         // do we have _exactly_ one child?
         wxWindow *child = (wxWindow *)NULL;

-        for ( wxWindowList::Node *node = GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

               node;
               node = node->GetNext() )
         {
               node;
               node = node->GetNext() )
         {


@@ -139,9 +211,6 @@ void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
             {
                 if ( child )
                 {
             {
                 if ( child )
                 {

-#ifdef __WXPM__
-                    AlterChildPos();
-#endif

                     return;     // it's our second subwindow - nothing to do
                 }
 
                     return;     // it's our second subwindow - nothing to do
                 }
 


@@ -165,9 +234,6 @@ void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
 #endif
 
             child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs);
 #endif
 
             child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs);

-#ifdef __WXPM__
-            UpdateInternalSize(child, clientH);
-#endif

         }
     }
 }
         }
     }
 }


@@ -186,222 +252,22 @@ bool wxTopLevelWindowBase::SendIconizeEvent(bool iconized)
     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }
 

-// ----------------------------------------------------------------------------
-// interactive manipulation
-// ----------------------------------------------------------------------------
-
-#ifdef __WXUNIVERSAL__
-
-#define wxINTERACTIVE_RESIZE_DIR \
-          (wxINTERACTIVE_RESIZE_W | wxINTERACTIVE_RESIZE_E | \
-           wxINTERACTIVE_RESIZE_S | wxINTERACTIVE_RESIZE_N)
-
-struct wxInteractiveMoveData
-{
-    wxTopLevelWindowBase *m_window;
-    wxEventLoop          *m_evtLoop;
-    int                   m_flags;
-    wxRect                m_rect;
-    wxRect                m_rectOrig;
-    wxPoint               m_pos;
-    wxSize                m_minSize, m_maxSize;
-};
-
-class wxInteractiveMoveHandler : public wxEvtHandler
-{
-public:
-    wxInteractiveMoveHandler(wxInteractiveMoveData& data) : m_data(data) {}
-
-private:
-    DECLARE_EVENT_TABLE()
-    void OnMouseMove(wxMouseEvent& event);
-    void OnMouseDown(wxMouseEvent& event);
-    void OnMouseUp(wxMouseEvent& event);
-    void OnKeyDown(wxKeyEvent& event);
-
-    wxInteractiveMoveData& m_data;
-};
-
-BEGIN_EVENT_TABLE(wxInteractiveMoveHandler, wxEvtHandler)
-    EVT_MOTION(wxInteractiveMoveHandler::OnMouseMove)
-    EVT_LEFT_DOWN(wxInteractiveMoveHandler::OnMouseDown)
-    EVT_LEFT_UP(wxInteractiveMoveHandler::OnMouseUp)
-    EVT_KEY_DOWN(wxInteractiveMoveHandler::OnKeyDown)
-END_EVENT_TABLE()
-
-
-static inline LINKAGEMODE
-void wxApplyResize(wxInteractiveMoveData& data, const wxPoint& diff)
-{
-    if ( data.m_flags & wxINTERACTIVE_RESIZE_W )
-    {
-        data.m_rect.x += diff.x;
-        data.m_rect.width -= diff.x;
-    }
-    else if ( data.m_flags & wxINTERACTIVE_RESIZE_E )
-    {
-        data.m_rect.width += diff.x;
-    }
-    if ( data.m_flags & wxINTERACTIVE_RESIZE_N )
-    {
-        data.m_rect.y += diff.y;
-        data.m_rect.height -= diff.y;
-    }
-    else if ( data.m_flags & wxINTERACTIVE_RESIZE_S )
-    {
-        data.m_rect.height += diff.y;
-    }
-
-    if ( data.m_minSize.x != -1 && data.m_rect.width < data.m_minSize.x )
-    {
-        if ( data.m_flags & wxINTERACTIVE_RESIZE_W )
-            data.m_rect.x -= data.m_minSize.x - data.m_rect.width;
-        data.m_rect.width = data.m_minSize.x;
-    }
-    if ( data.m_maxSize.x != -1 && data.m_rect.width > data.m_maxSize.x )
-    {
-        if ( data.m_flags & wxINTERACTIVE_RESIZE_W )
-            data.m_rect.x -= data.m_minSize.x - data.m_rect.width;
-        data.m_rect.width = data.m_maxSize.x;
-    }
-    if ( data.m_minSize.y != -1 && data.m_rect.height < data.m_minSize.y )
-    {
-        if ( data.m_flags & wxINTERACTIVE_RESIZE_N )
-            data.m_rect.y -= data.m_minSize.y - data.m_rect.height;
-        data.m_rect.height = data.m_minSize.y;
-    }
-    if ( data.m_maxSize.y != -1 && data.m_rect.height > data.m_maxSize.y )
-    {
-        if ( data.m_flags & wxINTERACTIVE_RESIZE_N )
-            data.m_rect.y -= data.m_minSize.y - data.m_rect.height;
-        data.m_rect.height = data.m_maxSize.y;
-    }
-}
-
-void wxInteractiveMoveHandler::OnMouseMove(wxMouseEvent& event)
-{
-    if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
-        event.Skip();
-
-    else if ( m_data.m_flags & wxINTERACTIVE_MOVE )
-    {
-        wxPoint diff = wxGetMousePosition() - m_data.m_pos;
-        m_data.m_rect = m_data.m_rectOrig;
-        m_data.m_rect.Offset(diff);
-        m_data.m_window->Move(m_data.m_rect.GetPosition());
-    }
-
-    else if ( m_data.m_flags & wxINTERACTIVE_RESIZE )
-    {
-        wxPoint diff = wxGetMousePosition() - m_data.m_pos;
-        m_data.m_rect = m_data.m_rectOrig;
-        wxApplyResize(m_data, diff);
-        m_data.m_window->SetSize(m_data.m_rect);
-    }
-}
-
-void wxInteractiveMoveHandler::OnMouseDown(wxMouseEvent& event)
+// do the window-specific processing after processing the update event
+void wxTopLevelWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)

 {
 {

-    if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
+    if ( event.GetSetEnabled() )
+        Enable(event.GetEnabled());
+    
+    if ( event.GetSetText() )

     {
     {

-        m_data.m_flags &= ~wxINTERACTIVE_WAIT_FOR_INPUT;
-        m_data.m_pos = wxGetMousePosition();
+        if ( event.GetText() != GetTitle() )
+            SetTitle(event.GetText());

     }
 }
 
     }
 }
 

-void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
-{
-    if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
-    {
-        m_data.m_flags &= ~wxINTERACTIVE_WAIT_FOR_INPUT;
-        m_data.m_pos = wxGetMousePosition();
-    }
-
-    wxPoint diff(-1,-1);
-
-    switch ( event.GetKeyCode() )
-    {
-        case WXK_UP:    diff = wxPoint(0, -16); break;
-        case WXK_DOWN:  diff = wxPoint(0, 16);  break;
-        case WXK_LEFT:  diff = wxPoint(-16, 0); break;
-        case WXK_RIGHT: diff = wxPoint(16, 0);  break;
-        case WXK_ESCAPE:
-            m_data.m_window->SetSize(m_data.m_rectOrig);
-            m_data.m_evtLoop->Exit();
-            return;
-        case WXK_RETURN:
-            m_data.m_evtLoop->Exit();
-            return;
-    }
-
-    if ( diff.x != -1 )
-    {
-        if ( m_data.m_flags & wxINTERACTIVE_MOVE )
-        {
-            m_data.m_rect.Offset(diff);
-            m_data.m_window->Move(m_data.m_rect.GetPosition());
-        }
-        else /* wxINTERACTIVE_RESIZE */
-        {
-            if ( !(m_data.m_flags & wxINTERACTIVE_RESIZE_DIR) )
-            {
-                if ( diff.y < 0 )
-                    m_data.m_flags |= wxINTERACTIVE_RESIZE_N;
-                else if ( diff.y > 0 )
-                    m_data.m_flags |= wxINTERACTIVE_RESIZE_S;
-                if ( diff.x < 0 )
-                    m_data.m_flags |= wxINTERACTIVE_RESIZE_W;
-                else if ( diff.x > 0 )
-                    m_data.m_flags |= wxINTERACTIVE_RESIZE_E;
-            }
-
-            wxApplyResize(m_data, diff);
-            m_data.m_window->SetSize(m_data.m_rect);
-        }
-    }
-}
-
-void wxInteractiveMoveHandler::OnMouseUp(wxMouseEvent& event)
-{
-    m_data.m_evtLoop->Exit();
-}
-
-
-void wxTopLevelWindowBase::InteractiveMove(int flags)
+void wxTopLevelWindowBase::RequestUserAttention(int WXUNUSED(flags))

 {
 {

-    wxASSERT_MSG( !((flags & wxINTERACTIVE_MOVE) && (flags & wxINTERACTIVE_RESIZE)),
-                  wxT("can't move and resize window at the same time") );
-
-    wxASSERT_MSG( !(flags & wxINTERACTIVE_RESIZE) ||
-                  (flags & wxINTERACTIVE_WAIT_FOR_INPUT) ||
-                  (flags & wxINTERACTIVE_RESIZE_DIR),
-                  wxT("direction of resizing not specified") );
-
-    wxInteractiveMoveData data;
-    wxEventLoop loop;
-    wxWindow *focus = FindFocus();
-
-    // FIXME - display resize cursor if waiting for initial input
-
-    data.m_window = this;
-    data.m_evtLoop = &loop;
-    data.m_flags = flags;
-    data.m_rect = data.m_rectOrig = GetRect();
-    data.m_pos = wxGetMousePosition();
-    data.m_minSize = wxSize(GetMinWidth(), GetMinHeight());
-    data.m_maxSize = wxSize(GetMaxWidth(), GetMaxHeight());
-
-    this->PushEventHandler(new wxInteractiveMoveHandler(data));
-    if ( focus )
-        focus->PushEventHandler(new wxInteractiveMoveHandler(data));
-
-    CaptureMouse();
-    loop.Run();
-    ReleaseMouse();
-
-    this->PopEventHandler(TRUE/*delete*/);
-    if ( focus )
-        focus->PopEventHandler(TRUE/*delete*/);
+    // it's probably better than do nothing, isn't it?
+    Raise();

 }
 
 }
 

-#endif // __WXUNIVERSAL__