Split some of the recent code out to make it more reusable.

[wxWidgets.git] / src / univ / topluniv.cpp

diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index b324c5ba23d77a49b4240bb0cbf19dfb6c8fff13..6b69e2fb2636b1fd4a9622fb06da8a29667ba9f5 100644 (file)
--- a/src/univ/topluniv.cpp
+++ b/src/univ/topluniv.cpp
@@ -2,7 +2,7 @@
 // Name:        topluniv.cpp
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Name:        topluniv.cpp
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

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


@@ -14,7 +14,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "univtoplevel.h"
 #endif
 
     #pragma implementation "univtoplevel.h"
 #endif
 


@@ -47,6 +47,7 @@
 BEGIN_EVENT_TABLE(wxTopLevelWindow, wxTopLevelWindowNative)
     WX_EVENT_TABLE_INPUT_CONSUMER(wxTopLevelWindow)
     EVT_NC_PAINT(wxTopLevelWindow::OnNcPaint)
 BEGIN_EVENT_TABLE(wxTopLevelWindow, wxTopLevelWindowNative)
     WX_EVENT_TABLE_INPUT_CONSUMER(wxTopLevelWindow)
     EVT_NC_PAINT(wxTopLevelWindow::OnNcPaint)

+    EVT_MENU_RANGE(wxID_CLOSE_FRAME, wxID_RESTORE_FRAME, wxTopLevelWindow::OnSystemMenu)

 END_EVENT_TABLE()
 
 WX_FORWARD_TO_INPUT_CONSUMER(wxTopLevelWindow)
 END_EVENT_TABLE()
 
 WX_FORWARD_TO_INPUT_CONSUMER(wxTopLevelWindow)


@@ -60,7 +61,7 @@ int wxTopLevelWindow::ms_canIconize = -1;
 
 void wxTopLevelWindow::Init()
 {
 
 void wxTopLevelWindow::Init()
 {

-    m_isActive = FALSE;
+    m_isActive = false;

     m_windowStyle = 0;
     m_pressedButton = 0;
 }
     m_windowStyle = 0;
     m_pressedButton = 0;
 }


@@ -100,14 +101,14 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
         style &= ~(wxCAPTION | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
                    wxSYSTEM_MENU | wxRESIZE_BORDER | wxFRAME_TOOL_WINDOW |
                    wxTHICK_FRAME);
         style &= ~(wxCAPTION | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
                    wxSYSTEM_MENU | wxRESIZE_BORDER | wxFRAME_TOOL_WINDOW |
                    wxTHICK_FRAME);

-        style = wxSIMPLE_BORDER;
+        style |= wxSIMPLE_BORDER;

         SetExtraStyle(exstyleOrig &
                       ~(wxFRAME_EX_CONTEXTHELP | wxDIALOG_EX_CONTEXTHELP));
     }
 
     if ( !wxTopLevelWindowNative::Create(parent, id, title, pos,
                                          size, style, name) )
         SetExtraStyle(exstyleOrig &
                       ~(wxFRAME_EX_CONTEXTHELP | wxDIALOG_EX_CONTEXTHELP));
     }
 
     if ( !wxTopLevelWindowNative::Create(parent, id, title, pos,
                                          size, style, name) )

-        return FALSE;
+        return false;

 
     if ( ms_drawDecorations )
     {
 
     if ( ms_drawDecorations )
     {


@@ -115,12 +116,12 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
         m_exStyle = exstyleOrig;
     }
 
         m_exStyle = exstyleOrig;
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxTopLevelWindow::ShowFullScreen(bool show, long style)
 {
 }
 
 bool wxTopLevelWindow::ShowFullScreen(bool show, long style)
 {

-    if ( show == IsFullScreen() ) return FALSE;
+    if ( show == IsFullScreen() ) return false;

 
     if ( ms_drawDecorations )
     {
 
     if ( ms_drawDecorations )
     {


@@ -211,15 +212,7 @@ void wxTopLevelWindow::DoGetClientSize(int *width, int *height) const
     if ( ms_drawDecorations )
     {
         int w, h;
     if ( ms_drawDecorations )
     {
         int w, h;

-        // VS: we can't use real client area size in 'rect', because
-        //     wxTLWNative::DoGetClientSize calls GetClientAreaOrigin
-        //     under wxMSW which in turn calls DoGetClientSize... 
-        //     inifinite recursion
-        #if 0

         wxTopLevelWindowNative::DoGetClientSize(&w, &h);
         wxTopLevelWindowNative::DoGetClientSize(&w, &h);

-        #else
-        w = h = 500;
-        #endif

         wxRect rect = wxRect(wxTopLevelWindowNative::GetClientAreaOrigin(),
                              wxSize(w, h));
         rect = m_renderer->GetFrameClientArea(rect,
         wxRect rect = wxRect(wxTopLevelWindowNative::GetClientAreaOrigin(),
                              wxSize(w, h));
         rect = m_renderer->GetFrameClientArea(rect,


@@ -245,7 +238,7 @@ void wxTopLevelWindow::DoSetClientSize(int width, int height)
         wxTopLevelWindowNative::DoSetClientSize(width, height);
 }
 
         wxTopLevelWindowNative::DoSetClientSize(width, height);
 }
 

-void wxTopLevelWindow::OnNcPaint(wxPaintEvent& event)
+void wxTopLevelWindow::OnNcPaint(wxNcPaintEvent& event)

 {
     if ( !ms_drawDecorations || !m_renderer )
         event.Skip();
 {
     if ( !ms_drawDecorations || !m_renderer )
         event.Skip();


@@ -277,19 +270,42 @@ long wxTopLevelWindow::HitTest(const wxPoint& pt) const
     return m_renderer->HitTestFrame(rect, pt+GetClientAreaOrigin(), GetDecorationsStyle());
 }
 
     return m_renderer->HitTestFrame(rect, pt+GetClientAreaOrigin(), GetDecorationsStyle());
 }
 

+int wxTopLevelWindow::GetMinWidth() const
+{
+    if ( ms_drawDecorations )
+    {
+        return wxMax(wxTopLevelWindowNative::GetMinWidth(),
+                     m_renderer->GetFrameMinSize(GetDecorationsStyle()).x);
+    }
+    else
+        return wxTopLevelWindowNative::GetMinWidth();
+}
+
+int wxTopLevelWindow::GetMinHeight() const
+{
+    if ( ms_drawDecorations )
+    {
+        return wxMax(wxTopLevelWindowNative::GetMinHeight(),
+                     m_renderer->GetFrameMinSize(GetDecorationsStyle()).y);
+    }
+    else
+        return wxTopLevelWindowNative::GetMinHeight();
+}
+

 // ----------------------------------------------------------------------------
 // icons
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // icons
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindow::SetIcon(const wxIcon& icon)
+void wxTopLevelWindow::SetIcons(const wxIconBundle& icons)

 {
 {

-    wxTopLevelWindowNative::SetIcon(icon);
+    wxTopLevelWindowNative::SetIcons(icons);

 
     if ( ms_drawDecorations && m_renderer )
     {
         wxSize size = m_renderer->GetFrameIconSize();
 
     if ( ms_drawDecorations && m_renderer )
     {
         wxSize size = m_renderer->GetFrameIconSize();

+        const wxIcon& icon = icons.GetIcon( size );

 
 

-        if ( !icon.Ok() || size.x == -1  )
+        if ( !icon.Ok() || size.x == wxDefaultCoord  )

             m_titlebarIcon = icon;
         else
         {
             m_titlebarIcon = icon;
         else
         {


@@ -313,19 +329,56 @@ void wxTopLevelWindow::SetIcon(const wxIcon& icon)
 // interactive manipulation
 // ----------------------------------------------------------------------------
 
 // interactive manipulation
 // ----------------------------------------------------------------------------
 

+
+static bool wxGetResizingCursor(long hitTestResult, wxCursor& cursor)
+{
+    if ( hitTestResult & wxHT_TOPLEVEL_ANY_BORDER )
+    {
+        switch (hitTestResult)
+        {
+            case wxHT_TOPLEVEL_BORDER_N:
+            case wxHT_TOPLEVEL_BORDER_S:
+                cursor = wxCursor(wxCURSOR_SIZENS);
+                break;
+            case wxHT_TOPLEVEL_BORDER_W:
+            case wxHT_TOPLEVEL_BORDER_E:
+                cursor = wxCursor(wxCURSOR_SIZEWE);
+                break;
+            case wxHT_TOPLEVEL_BORDER_NE:
+            case wxHT_TOPLEVEL_BORDER_SW:
+                cursor = wxCursor(wxCURSOR_SIZENESW);
+                break;
+            case wxHT_TOPLEVEL_BORDER_NW:
+            case wxHT_TOPLEVEL_BORDER_SE:
+                cursor = wxCursor(wxCURSOR_SIZENWSE);
+                break;
+            default:
+                return false;
+                #if 0
+                // not rachable due to earlier return
+                break;
+                #endif
+        }
+        return true;
+    }
+    
+    return false;
+}
+

 #define wxINTERACTIVE_RESIZE_DIR \
           (wxINTERACTIVE_RESIZE_W | wxINTERACTIVE_RESIZE_E | \
            wxINTERACTIVE_RESIZE_S | wxINTERACTIVE_RESIZE_N)
 
 struct wxInteractiveMoveData
 {
 #define wxINTERACTIVE_RESIZE_DIR \
           (wxINTERACTIVE_RESIZE_W | wxINTERACTIVE_RESIZE_E | \
            wxINTERACTIVE_RESIZE_S | wxINTERACTIVE_RESIZE_N)
 
 struct wxInteractiveMoveData
 {

-    wxTopLevelWindowBase *m_window;
+    wxTopLevelWindow     *m_window;

     wxEventLoop          *m_evtLoop;
     int                   m_flags;
     wxRect                m_rect;
     wxRect                m_rectOrig;
     wxPoint               m_pos;
     wxSize                m_minSize, m_maxSize;
     wxEventLoop          *m_evtLoop;
     int                   m_flags;
     wxRect                m_rect;
     wxRect                m_rectOrig;
     wxPoint               m_pos;
     wxSize                m_minSize, m_maxSize;

+    bool                  m_sizingCursor;

 };
 
 class wxInteractiveMoveHandler : public wxEvtHandler
 };
 
 class wxInteractiveMoveHandler : public wxEvtHandler


@@ -373,25 +426,25 @@ void wxApplyResize(wxInteractiveMoveData& data, const wxPoint& diff)
         data.m_rect.height += diff.y;
     }
     
         data.m_rect.height += diff.y;
     }
     

-    if ( data.m_minSize.x != -1 && data.m_rect.width < data.m_minSize.x )
+    if ( data.m_minSize.x != wxDefaultCoord && 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_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_maxSize.x != wxDefaultCoord && 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_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_minSize.y != wxDefaultCoord && 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_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_maxSize.y != wxDefaultCoord && 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;
     {
         if ( data.m_flags & wxINTERACTIVE_RESIZE_N )
             data.m_rect.y -= data.m_minSize.y - data.m_rect.height;


@@ -421,24 +474,17 @@ void wxInteractiveMoveHandler::OnMouseMove(wxMouseEvent& event)
     }
 }
 
     }
 }
 

-void wxInteractiveMoveHandler::OnMouseDown(wxMouseEvent& event)
+void wxInteractiveMoveHandler::OnMouseDown(wxMouseEvent& WXUNUSED(event))

 {
     if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
     {
 {
     if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
     {

-        m_data.m_flags &= ~wxINTERACTIVE_WAIT_FOR_INPUT;
-        m_data.m_pos = wxGetMousePosition();
+        m_data.m_evtLoop->Exit();

     }
 }
 
 void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
 {
     }
 }
 
 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);
+    wxPoint diff(wxDefaultCoord,wxDefaultCoord);

     
     switch ( event.GetKeyCode() )
     {
     
     switch ( event.GetKeyCode() )
     {


@@ -455,34 +501,107 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
             return;
     }
     
             return;
     }
     

-    if ( diff.x != -1 )
+    if ( diff.x != wxDefaultCoord )

     {
     {

+        if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
+        {
+            m_data.m_flags &= ~wxINTERACTIVE_WAIT_FOR_INPUT;
+            if ( m_data.m_sizingCursor )
+            {
+                wxEndBusyCursor();
+                m_data.m_sizingCursor = false;
+            }
+
+            if ( m_data.m_flags & wxINTERACTIVE_MOVE )
+            {
+                m_data.m_pos = m_data.m_window->GetPosition() + 
+                               wxPoint(m_data.m_window->GetSize().x/2, 8);
+            }
+        }
+
+        wxPoint warp;
+        bool changeCur = false;
+        

         if ( m_data.m_flags & wxINTERACTIVE_MOVE )
         {
             m_data.m_rect.Offset(diff);
             m_data.m_window->Move(m_data.m_rect.GetPosition());
         if ( m_data.m_flags & wxINTERACTIVE_MOVE )
         {
             m_data.m_rect.Offset(diff);
             m_data.m_window->Move(m_data.m_rect.GetPosition());

+            warp = wxPoint(m_data.m_window->GetSize().x/2, 8);

         }
         else /* wxINTERACTIVE_RESIZE */
         {
         }
         else /* wxINTERACTIVE_RESIZE */
         {

-            if ( !(m_data.m_flags & wxINTERACTIVE_RESIZE_DIR) )
+            if ( !(m_data.m_flags & 
+                  (wxINTERACTIVE_RESIZE_N | wxINTERACTIVE_RESIZE_S)) )

             {
                 if ( diff.y < 0 )
             {
                 if ( diff.y < 0 )

+                {

                     m_data.m_flags |= wxINTERACTIVE_RESIZE_N;
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_N;

+                    m_data.m_pos.y = m_data.m_window->GetPosition().y;
+                    changeCur = true;
+                }

                 else if ( diff.y > 0 )
                 else if ( diff.y > 0 )

+                {

                     m_data.m_flags |= wxINTERACTIVE_RESIZE_S;
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_S;

+                    m_data.m_pos.y = m_data.m_window->GetPosition().y +
+                                     m_data.m_window->GetSize().y;
+                    changeCur = true;
+                }
+            }
+            if ( !(m_data.m_flags & 
+                  (wxINTERACTIVE_RESIZE_W | wxINTERACTIVE_RESIZE_E)) )
+            {

                 if ( diff.x < 0 )
                 if ( diff.x < 0 )

+                {

                     m_data.m_flags |= wxINTERACTIVE_RESIZE_W;
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_W;

+                    m_data.m_pos.x = m_data.m_window->GetPosition().x;
+                    changeCur = true;
+                }

                 else if ( diff.x > 0 )
                 else if ( diff.x > 0 )

+                {

                     m_data.m_flags |= wxINTERACTIVE_RESIZE_E;
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_E;

+                    m_data.m_pos.x = m_data.m_window->GetPosition().x +
+                                     m_data.m_window->GetSize().x;
+                    changeCur = true;
+                }

             }
 
             wxApplyResize(m_data, diff);
             m_data.m_window->SetSize(m_data.m_rect);
             }
 
             wxApplyResize(m_data, diff);
             m_data.m_window->SetSize(m_data.m_rect);

+
+            if ( m_data.m_flags & wxINTERACTIVE_RESIZE_W )
+                warp.x = 0;
+            else if ( m_data.m_flags & wxINTERACTIVE_RESIZE_E )
+                warp.x = m_data.m_window->GetSize().x-1;
+            else
+                warp.x = wxGetMousePosition().x - m_data.m_window->GetPosition().x;
+
+            if ( m_data.m_flags & wxINTERACTIVE_RESIZE_N )
+                warp.y = 0;
+            else if ( m_data.m_flags & wxINTERACTIVE_RESIZE_S )
+                warp.y = m_data.m_window->GetSize().y-1;
+            else
+                warp.y = wxGetMousePosition().y - m_data.m_window->GetPosition().y;
+        }
+
+        warp -= m_data.m_window->GetClientAreaOrigin();
+        m_data.m_window->WarpPointer(warp.x, warp.y);
+
+        if ( changeCur )
+        {
+            long hit = m_data.m_window->HitTest(warp);
+            wxCursor cur;
+            if ( wxGetResizingCursor(hit, cur) )
+            {
+                if ( m_data.m_sizingCursor )
+                    wxEndBusyCursor();
+                wxBeginBusyCursor(&cur);
+                m_data.m_sizingCursor = true;
+            }

         }
     }
 }
 
         }
     }
 }
 

-void wxInteractiveMoveHandler::OnMouseUp(wxMouseEvent& event)
+void wxInteractiveMoveHandler::OnMouseUp(wxMouseEvent& WXUNUSED(event))

 {
     m_data.m_evtLoop->Exit();
 }
 {
     m_data.m_evtLoop->Exit();
 }


@@ -500,9 +619,19 @@ void wxTopLevelWindow::InteractiveMove(int flags)
 
     wxInteractiveMoveData data;
     wxEventLoop loop;
 
     wxInteractiveMoveData data;
     wxEventLoop loop;

-    wxWindow *focus = FindFocus();

     
     

-    // FIXME - display resize cursor if waiting for initial input
+    SetFocus();
+
+#ifndef __WXGTK__    
+    if ( flags & wxINTERACTIVE_WAIT_FOR_INPUT )
+    {
+        wxCursor sizingCursor(wxCURSOR_SIZING);
+        wxBeginBusyCursor(&sizingCursor);
+        data.m_sizingCursor = true;
+    }
+    else
+#endif
+        data.m_sizingCursor = false;

 
     data.m_window = this;
     data.m_evtLoop = &loop;
 
     data.m_window = this;
     data.m_evtLoop = &loop;


@@ -512,17 +641,18 @@ void wxTopLevelWindow::InteractiveMove(int flags)
     data.m_minSize = wxSize(GetMinWidth(), GetMinHeight());
     data.m_maxSize = wxSize(GetMaxWidth(), GetMaxHeight());
 
     data.m_minSize = wxSize(GetMinWidth(), GetMinHeight());
     data.m_maxSize = wxSize(GetMaxWidth(), GetMaxHeight());
 

-    this->PushEventHandler(new wxInteractiveMoveHandler(data));
-    if ( focus )
-        focus->PushEventHandler(new wxInteractiveMoveHandler(data));
+    wxEvtHandler *handler = new wxInteractiveMoveHandler(data);
+    this->PushEventHandler(handler);

 
     CaptureMouse();
     loop.Run();
     ReleaseMouse();
 
 
     CaptureMouse();
     loop.Run();
     ReleaseMouse();
 

-    this->PopEventHandler(TRUE/*delete*/);
-    if ( focus )
-        focus->PopEventHandler(TRUE/*delete*/);
+    this->RemoveEventHandler(handler);
+    delete handler;
+
+    if ( data.m_sizingCursor )
+        wxEndBusyCursor();

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


@@ -564,7 +694,7 @@ void wxTopLevelWindow::ClickTitleBarButton(long button)
 
 bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
                                      long numArg,
 
 bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
                                      long numArg,

-                                     const wxString& strArg)
+                                     const wxString& WXUNUSED(strArg))

 {
     bool isActive = numArg != 0;
 
 {
     bool isActive = numArg != 0;
 


@@ -575,21 +705,21 @@ bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
             m_isActive = isActive;
             RefreshTitleBar();
         }
             m_isActive = isActive;
             RefreshTitleBar();
         }

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_PRESS )
     {
         m_pressedButton = numArg;
         RefreshTitleBar();
     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_PRESS )
     {
         m_pressedButton = numArg;
         RefreshTitleBar();

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_RELEASE )
     {
         m_pressedButton = 0;
         RefreshTitleBar();
     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_RELEASE )
     {
         m_pressedButton = 0;
         RefreshTitleBar();

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_CLICK )
     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_CLICK )


@@ -597,13 +727,13 @@ bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
         m_pressedButton = 0;
         RefreshTitleBar();
         ClickTitleBarButton(numArg);
         m_pressedButton = 0;
         RefreshTitleBar();
         ClickTitleBarButton(numArg);

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_MOVE )
     {
         InteractiveMove(wxINTERACTIVE_MOVE);
     }
 
     else if ( action == wxACTION_TOPLEVEL_MOVE )
     {
         InteractiveMove(wxINTERACTIVE_MOVE);

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_RESIZE )
     }
 
     else if ( action == wxACTION_TOPLEVEL_RESIZE )


@@ -618,11 +748,48 @@ bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
         if ( numArg & wxHT_TOPLEVEL_BORDER_E )
             flags |= wxINTERACTIVE_RESIZE_E;
         InteractiveMove(flags);
         if ( numArg & wxHT_TOPLEVEL_BORDER_E )
             flags |= wxINTERACTIVE_RESIZE_E;
         InteractiveMove(flags);

-        return TRUE;
+        return true;

     }
 
     else
     }
 
     else

-        return FALSE;
+        return false;
+}
+
+void wxTopLevelWindow::OnSystemMenu(wxCommandEvent& event)
+{
+    bool ret = true;
+    
+    switch (event.GetId())
+    {
+        case wxID_CLOSE_FRAME:
+            ret = PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK,
+                                wxTOPLEVEL_BUTTON_CLOSE);
+            break;
+        case wxID_MOVE_FRAME:
+            InteractiveMove(wxINTERACTIVE_MOVE | wxINTERACTIVE_WAIT_FOR_INPUT);
+            break;
+        case wxID_RESIZE_FRAME:
+            InteractiveMove(wxINTERACTIVE_RESIZE | wxINTERACTIVE_WAIT_FOR_INPUT);
+            break;
+        case wxID_MAXIMIZE_FRAME:
+            ret = PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK,
+                                wxTOPLEVEL_BUTTON_MAXIMIZE);
+            break;
+        case wxID_ICONIZE_FRAME:
+            ret = PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK,
+                                wxTOPLEVEL_BUTTON_ICONIZE);
+            break;
+        case wxID_RESTORE_FRAME:
+            ret = PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK,
+                                wxTOPLEVEL_BUTTON_RESTORE);
+            break;
+
+        default:
+            ret = false;
+    }
+    
+    if ( !ret )
+        event.Skip();

 }
 
 
 }
 
 


@@ -636,7 +803,7 @@ wxStdFrameInputHandler::wxStdFrameInputHandler(wxInputHandler *inphand)
     m_winCapture = NULL;
     m_winHitTest = 0;
     m_winPressed = 0;
     m_winCapture = NULL;
     m_winHitTest = 0;
     m_winPressed = 0;

-    m_borderCursorOn = FALSE;
+    m_borderCursorOn = false;

 }
 
 bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer,
 }
 
 bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer,


@@ -664,18 +831,18 @@ bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer,
                 m_winHitTest = hit;
                 m_winPressed = hit;
                 consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_PRESS, m_winPressed);
                 m_winHitTest = hit;
                 m_winPressed = hit;
                 consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_PRESS, m_winPressed);

-                return TRUE;
+                return true;

             }
             }

-            else if ( hit & wxHT_TOPLEVEL_TITLEBAR )
+            else if ( (hit & wxHT_TOPLEVEL_TITLEBAR) && !w->IsMaximized() )

             {
                 consumer->PerformAction(wxACTION_TOPLEVEL_MOVE);
             {
                 consumer->PerformAction(wxACTION_TOPLEVEL_MOVE);

-                return TRUE;
+                return true;

             }
             else if ( (consumer->GetInputWindow()->GetWindowStyle() & wxRESIZE_BORDER)
                       && (hit & wxHT_TOPLEVEL_ANY_BORDER) )
             {
                 consumer->PerformAction(wxACTION_TOPLEVEL_RESIZE, hit);
             }
             else if ( (consumer->GetInputWindow()->GetWindowStyle() & wxRESIZE_BORDER)
                       && (hit & wxHT_TOPLEVEL_ANY_BORDER) )
             {
                 consumer->PerformAction(wxACTION_TOPLEVEL_RESIZE, hit);

-                return TRUE;
+                return true;

             }
         }
 
             }
         }
 


@@ -689,7 +856,7 @@ bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer,
                 if ( m_winHitTest == m_winPressed )
                 {
                     consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK, m_winPressed);
                 if ( m_winHitTest == m_winPressed )
                 {
                     consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK, m_winPressed);

-                    return TRUE;
+                    return true;

                 }
             }
             //else: the mouse was released outside the window, this doesn't
                 }
             }
             //else: the mouse was released outside the window, this doesn't


@@ -715,7 +882,7 @@ bool wxStdFrameInputHandler::HandleMouseMove(wxInputConsumer *consumer,
                 consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_PRESS, m_winPressed);
 
             m_winHitTest = hit;
                 consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_PRESS, m_winPressed);
 
             m_winHitTest = hit;

-            return TRUE;
+            return true;

         }
     }
     else if ( consumer->GetInputWindow()->GetWindowStyle() & wxRESIZE_BORDER )
         }
     }
     else if ( consumer->GetInputWindow()->GetWindowStyle() & wxRESIZE_BORDER )


@@ -730,37 +897,15 @@ bool wxStdFrameInputHandler::HandleMouseMove(wxInputConsumer *consumer,
 
             if ( m_borderCursorOn )
             {
 
             if ( m_borderCursorOn )
             {

-                m_borderCursorOn = FALSE;
+                m_borderCursorOn = false;

                 win->SetCursor(m_origCursor);
             }
 
             if ( hit & wxHT_TOPLEVEL_ANY_BORDER )
             {
                 win->SetCursor(m_origCursor);
             }
 
             if ( hit & wxHT_TOPLEVEL_ANY_BORDER )
             {

-                m_borderCursorOn = TRUE;

                 wxCursor cur;
 
                 wxCursor cur;
 

-                switch (hit)
-                {
-                    case wxHT_TOPLEVEL_BORDER_N:
-                    case wxHT_TOPLEVEL_BORDER_S:
-                        cur = wxCursor(wxCURSOR_SIZENS);
-                        break;
-                    case wxHT_TOPLEVEL_BORDER_W:
-                    case wxHT_TOPLEVEL_BORDER_E:
-                        cur = wxCursor(wxCURSOR_SIZEWE);
-                        break;
-                    case wxHT_TOPLEVEL_BORDER_NE:
-                    case wxHT_TOPLEVEL_BORDER_SW:
-                        cur = wxCursor(wxCURSOR_SIZENESW);
-                        break;
-                    case wxHT_TOPLEVEL_BORDER_NW:
-                    case wxHT_TOPLEVEL_BORDER_SE:
-                        cur = wxCursor(wxCURSOR_SIZENWSE);
-                        break;
-                    default:
-                        m_borderCursorOn = FALSE;
-                        break;
-                }
+                m_borderCursorOn = wxGetResizingCursor(hit, cur);

                 if ( m_borderCursorOn )
                 {
                     m_origCursor = win->GetCursor();
                 if ( m_borderCursorOn )
                 {
                     m_origCursor = win->GetCursor();


@@ -779,8 +924,8 @@ bool wxStdFrameInputHandler::HandleActivation(wxInputConsumer *consumer,
     if ( m_borderCursorOn )
     {
         consumer->GetInputWindow()->SetCursor(m_origCursor);
     if ( m_borderCursorOn )
     {
         consumer->GetInputWindow()->SetCursor(m_origCursor);

-        m_borderCursorOn = FALSE;
+        m_borderCursorOn = false;

     }
     consumer->PerformAction(wxACTION_TOPLEVEL_ACTIVATE, activated);
     }
     consumer->PerformAction(wxACTION_TOPLEVEL_ACTIVATE, activated);

-    return FALSE;
+    return false;

 }
 }