64bit fix for patch as well

[wxWidgets.git] / src / motif / mdi.cpp

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 98608e9055fd37a6c4a09bf23764052c92c0121b..fe31aa958af6db743b777f8eff4bb26d9bed5a67 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.cpp
+// Name:        src/motif/mdi.cpp

 // Purpose:     MDI classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     MDI classes
 // Author:      Julian Smart
 // Modified by:


@@ -9,13 +9,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "mdi.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW

 #endif
 
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"

-#include "wx/menu.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/icon.h"
+    #include "wx/settings.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -97,10 +105,10 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
         int w, h;
         GetClientSize(& w, & h);
         m_clientWindow->SetSize(0, 0, w, h);
         int w, h;
         GetClientSize(& w, & h);
         m_clientWindow->SetSize(0, 0, w, h);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()


@@ -223,11 +231,11 @@ bool wxMDIParentFrame::ProcessEvent(wxEvent& event)
     // Stops the same event being processed repeatedly
     static wxEventType inEvent = wxEVT_NULL;
     if (inEvent == event.GetEventType())
     // Stops the same event being processed repeatedly
     static wxEventType inEvent = wxEVT_NULL;
     if (inEvent == event.GetEventType())

-        return FALSE;
+        return false;

 
     inEvent = event.GetEventType();
 
 
     inEvent = event.GetEventType();
 

-    bool res = FALSE;
+    bool res = false;

     if (m_activeChild && event.IsKindOf(CLASSINFO(wxCommandEvent)))
     {
         res = m_activeChild->GetEventHandler()->ProcessEvent(event);
     if (m_activeChild && event.IsKindOf(CLASSINFO(wxCommandEvent)))
     {
         res = m_activeChild->GetEventHandler()->ProcessEvent(event);


@@ -268,7 +276,7 @@ void wxMDIParentFrame::Cascade()
     // TODO
 }
 
     // TODO
 }
 

-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation WXUNUSED(orient))

 {
     // TODO
 }
 {
     // TODO
 }


@@ -294,7 +302,7 @@ void wxMDIParentFrame::OnMenuHighlight(wxMenuEvent& event)
     if (GetStatusBar())
     {
         if (event.GetMenuId() == -1)
     if (GetStatusBar())
     {
         if (event.GetMenuId() == -1)

-            SetStatusText("");
+            SetStatusText(wxEmptyString);

         else
         {
             wxMenuBar *menuBar = (wxMenuBar*) NULL;
         else
         {
             wxMenuBar *menuBar = (wxMenuBar*) NULL;


@@ -305,7 +313,7 @@ void wxMDIParentFrame::OnMenuHighlight(wxMenuEvent& event)
             if (menuBar)
             {
                 wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
             if (menuBar)
             {
                 wxString helpString(menuBar->GetHelpString(event.GetMenuId()));

-                if (helpString != "")
+                if (!helpString.empty())

                     SetStatusText(helpString);
             }
         }
                     SetStatusText(helpString);
             }
         }


@@ -330,10 +338,6 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
     SetName(name);
     SetWindowStyleFlag(style);
 
     SetName(name);
     SetWindowStyleFlag(style);
 

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
-    m_foregroundColour = *wxBLACK;
-    m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-

     if ( id > -1 )
         m_windowId = id;
     else
     if ( id > -1 )
         m_windowId = id;
     else


@@ -341,11 +345,12 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
     wxMDIClientWindow* clientWindow = parent->GetClientWindow();
 
 
     wxMDIClientWindow* clientWindow = parent->GetClientWindow();
 

-    wxASSERT_MSG( (clientWindow != (wxWindow*) NULL), "Missing MDI client window.");
+    wxCHECK_MSG( clientWindow, false, "Missing MDI client window." );

 
 

-    if (clientWindow) clientWindow->AddChild(this);
+    clientWindow->AddChild(this);

 
     SetMDIParentFrame(parent);
 
     SetMDIParentFrame(parent);

+    PreCreation();

 
     int width = size.x;
     int height = size.y;
 
     int width = size.x;
     int height = size.y;


@@ -358,7 +363,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
     wxMDIChildFrame* oldActiveChild = parent->GetActiveChild();
     if (oldActiveChild)
     {
     wxMDIChildFrame* oldActiveChild = parent->GetActiveChild();
     if (oldActiveChild)
     {

-        wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldActiveChild->GetId());
+        wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());

         event.SetEventObject( oldActiveChild );
         oldActiveChild->GetEventHandler()->ProcessEvent(event);
     }
         event.SetEventObject( oldActiveChild );
         oldActiveChild->GetEventHandler()->ProcessEvent(event);
     }


@@ -382,33 +387,31 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
         XmNresizePolicy, XmRESIZE_NONE,
         NULL);
 
         XmNresizePolicy, XmRESIZE_NONE,
         NULL);
 

-    XtAddEventHandler((Widget) m_mainWidget, ExposureMask,FALSE,
+    XtAddEventHandler((Widget) m_mainWidget, ExposureMask,False,

         wxUniversalRepaintProc, (XtPointer) this);
 
         wxUniversalRepaintProc, (XtPointer) this);
 

-    SetCanAddEventHandler(TRUE);
+    PostCreation();

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 

-    ChangeBackgroundColour();
-

     XtManageChild((Widget) m_mainWidget);
 
     SetTitle(title);
 
     XtManageChild((Widget) m_mainWidget);
 
     SetTitle(title);
 

-    clientWindow->AddPage(this, title, TRUE);
+    clientWindow->AddPage(this, title, true);

     clientWindow->Refresh();
 
     // Positions the toolbar and status bar -- but we don't have any.
     //    PreResize();
 
     wxModelessWindows.Append(this);
     clientWindow->Refresh();
 
     // Positions the toolbar and status bar -- but we don't have any.
     //    PreResize();
 
     wxModelessWindows.Append(this);

-    return TRUE;
+    return true;

 }
 
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
     if (m_mainWidget)
 }
 
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
     if (m_mainWidget)

-      XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,FALSE,
+      XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,False,

         wxUniversalRepaintProc, (XtPointer) this);
 
     if (GetMDIParentFrame())
         wxUniversalRepaintProc, (XtPointer) this);
 
     if (GetMDIParentFrame())


@@ -420,8 +423,15 @@ wxMDIChildFrame::~wxMDIChildFrame()
         wxMDIClientWindow* clientWindow = parentFrame->GetClientWindow();
 
         // Remove page if still there
         wxMDIClientWindow* clientWindow = parentFrame->GetClientWindow();
 
         // Remove page if still there

-        if (clientWindow->RemovePage(this))
-            clientWindow->Refresh();
+        {
+            int i = clientWindow->FindPage(this);
+
+            if (i != -1)
+            {
+                clientWindow->RemovePage(i);
+                clientWindow->Refresh();
+            }
+        }

 
         // Set the selection to the first remaining page
         if (clientWindow->GetPageCount() > 0)
 
         // Set the selection to the first remaining page
         if (clientWindow->GetPageCount() > 0)


@@ -448,12 +458,12 @@ void wxMDIChildFrame::OnRaise()
 
     if (oldActiveChild)
     {
 
     if (oldActiveChild)
     {

-        wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldActiveChild->GetId());
+        wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());

         event.SetEventObject( oldActiveChild );
         oldActiveChild->GetEventHandler()->ProcessEvent(event);
     }
 
         event.SetEventObject( oldActiveChild );
         oldActiveChild->GetEventHandler()->ProcessEvent(event);
     }
 

-    wxActivateEvent event(wxEVT_ACTIVATE, TRUE, this->GetId());
+    wxActivateEvent event(wxEVT_ACTIVATE, true, this->GetId());

     event.SetEventObject( this );
     this->GetEventHandler()->ProcessEvent(event);
 }
     event.SetEventObject( this );
     this->GetEventHandler()->ProcessEvent(event);
 }


@@ -465,7 +475,7 @@ void wxMDIChildFrame::OnLower()
 
     if (oldActiveChild == this)
     {
 
     if (oldActiveChild == this)
     {

-        wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldActiveChild->GetId());
+        wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());

         event.SetEventObject( oldActiveChild );
         oldActiveChild->GetEventHandler()->ProcessEvent(event);
     }
         event.SetEventObject( oldActiveChild );
         oldActiveChild->GetEventHandler()->ProcessEvent(event);
     }


@@ -476,7 +486,7 @@ void wxMDIChildFrame::OnLower()
 #endif
 
 // Set the client size (i.e. leave the calculation of borders etc.
 #endif
 
 // Set the client size (i.e. leave the calculation of borders etc.

-// to wxWindows)
+// to wxWidgets)

 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
     wxWindow::DoSetClientSize(width, height);
 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
     wxWindow::DoSetClientSize(width, height);


@@ -504,7 +514,7 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 
 bool wxMDIChildFrame::Show(bool show)
 {
 
 bool wxMDIChildFrame::Show(bool show)
 {

-    m_visibleStatus = show; /* show-&-hide fix */
+    SetVisibleStatus( show );

     return wxWindow::Show(show);
 }
 
     return wxWindow::Show(show);
 }
 


@@ -522,21 +532,32 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menuBar)
 // Set icon
 void wxMDIChildFrame::SetIcon(const wxIcon& icon)
 {
 // Set icon
 void wxMDIChildFrame::SetIcon(const wxIcon& icon)
 {

-    m_icon = icon;
-    if (m_icon.Ok())
+    m_icons = wxIconBundle( icon );
+
+    if (icon.Ok())

     {
         // Not appropriate since there are no icons in
         // a tabbed window
     }
 }
 
     {
         // Not appropriate since there are no icons in
         // a tabbed window
     }
 }
 

+void wxMDIChildFrame::SetIcons(const wxIconBundle& icons)
+{
+    m_icons = icons;
+}
+

 void wxMDIChildFrame::SetTitle(const wxString& title)
 {
 void wxMDIChildFrame::SetTitle(const wxString& title)
 {

-    m_title = title;
+    wxTopLevelWindow::SetTitle( title );

     wxMDIClientWindow* clientWindow = GetMDIParentFrame()->GetClientWindow();
     wxMDIClientWindow* clientWindow = GetMDIParentFrame()->GetClientWindow();

-    int pageNo = clientWindow->FindPagePosition(this);
-    if (pageNo > -1)
-        clientWindow->SetPageText(pageNo, title);
+
+    // Remove page if still there
+    {
+        int i = clientWindow->FindPage(this);
+
+        if (i != -1)
+            clientWindow->SetPageText(i, title);
+    }

 }
 
 // MDI operations
 }
 
 // MDI operations


@@ -552,14 +573,14 @@ void wxMDIChildFrame::Iconize(bool WXUNUSED(iconize))
 
 bool wxMDIChildFrame::IsIconized() const
 {
 
 bool wxMDIChildFrame::IsIconized() const
 {

-    return FALSE;
+    return false;

 }
 
 // Is it maximized? Always maximized under Motif, using the
 // tabbed MDI implementation.
 bool wxMDIChildFrame::IsMaximized(void) const
 {
 }
 
 // Is it maximized? Always maximized under Motif, using the
 // tabbed MDI implementation.
 bool wxMDIChildFrame::IsMaximized(void) const
 {

-    return TRUE;
+    return true;

 }
 
 void wxMDIChildFrame::Restore()
 }
 
 void wxMDIChildFrame::Restore()


@@ -592,7 +613,7 @@ void wxMDIChildFrame::Lower(void)
     wxWindow::Raise();
 }
 
     wxWindow::Raise();
 }
 

-void wxMDIChildFrame::SetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))
+void wxMDIChildFrame::DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))

 {
 }
 
 {
 }
 


@@ -615,22 +636,24 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
     SetWindowStyleFlag(style);
 
 {
     SetWindowStyleFlag(style);
 

-    //    m_windowParent = parent;
-    //    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
-

     bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
     if (success)
     {
     bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
     if (success)
     {

-        wxFont font(10, wxSWISS, wxNORMAL, wxNORMAL);
-        wxFont selFont(10, wxSWISS, wxNORMAL, wxBOLD);
-        GetTabView()->SetTabFont(font);
-        GetTabView()->SetSelectedTabFont(selFont);
-        GetTabView()->SetTabSize(120, 18);
-        GetTabView()->SetTabSelectionHeight(20);
-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;
+}
+
+int wxMDIClientWindow::FindPage(const wxNotebookPage* page)
+{
+    for (int i = GetPageCount() - 1; i >= 0; --i)
+    {
+        if (GetPage(i) == page)
+            return i;
+    }
+
+    return -1;

 }
 
 void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 }
 
 void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)


@@ -658,10 +681,10 @@ void wxMDIClientWindow::DoGetPosition(int *x, int *y) const
     wxWindow::DoGetPosition(x, y);
 }
 
     wxWindow::DoGetPosition(x, y);
 }
 

-// Explicitly call default scroll behaviour
-void wxMDIClientWindow::OnScroll(wxScrollEvent& WXUNUSED(event))
+void wxMDIClientWindow::OnScroll(wxScrollEvent& event)

 {
 {

-    Default(); // Default processing
+    //    Default(); // Default processing: OBSOLETE FUNCTION
+    event.Skip();

 }
 
 void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)
 }
 
 void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)


@@ -672,7 +695,7 @@ void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)
         wxMDIChildFrame* oldChild = (wxMDIChildFrame*) GetPage(event.GetOldSelection());
         if (oldChild)
         {
         wxMDIChildFrame* oldChild = (wxMDIChildFrame*) GetPage(event.GetOldSelection());
         if (oldChild)
         {

-            wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldChild->GetId());
+            wxActivateEvent event(wxEVT_ACTIVATE, false, oldChild->GetId());

             event.SetEventObject( oldChild );
             oldChild->GetEventHandler()->ProcessEvent(event);
         }
             event.SetEventObject( oldChild );
             oldChild->GetEventHandler()->ProcessEvent(event);
         }


@@ -682,7 +705,7 @@ void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)
         wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
         if (activeChild)
         {
         wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
         if (activeChild)
         {

-            wxActivateEvent event(wxEVT_ACTIVATE, TRUE, activeChild->GetId());
+            wxActivateEvent event(wxEVT_ACTIVATE, true, activeChild->GetId());

             event.SetEventObject( activeChild );
             activeChild->GetEventHandler()->ProcessEvent(event);
 
             event.SetEventObject( activeChild );
             activeChild->GetEventHandler()->ProcessEvent(event);