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 5314c53dae255b17461c842bba856c12679e1fc5..fe31aa958af6db743b777f8eff4bb26d9bed5a67 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -22,10 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
     #include "wx/icon.h"
 #ifndef WX_PRECOMP
     #include "wx/menu.h"
     #include "wx/icon.h"

+    #include "wx/settings.h"

 #endif
 
 #endif
 

-#include "wx/settings.h"
-

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


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

-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
-    m_foregroundColour = *wxBLACK;
-    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-

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


@@ -350,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;


@@ -394,10 +390,9 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
     XtAddEventHandler((Widget) m_mainWidget, ExposureMask,False,
         wxUniversalRepaintProc, (XtPointer) this);
 
     XtAddEventHandler((Widget) m_mainWidget, ExposureMask,False,
         wxUniversalRepaintProc, (XtPointer) this);
 

+    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);


@@ -641,14 +636,9 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
     SetWindowStyleFlag(style);
 
 {
     SetWindowStyleFlag(style);
 

-    //    m_windowParent = parent;
-    //    m_backgroundColour = wxSystemSettings::GetColour(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);
-        SetFont(font);

         return true;
     }
     else
         return true;
     }
     else