wxDC::SetFont can now handle invalid font and doesn't assert anymore (other ports...

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

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 0af310949072f8a378c6ebad5a39e45ec594fc3d..f8aa8af3f064a1e7b193ded08e692bc83664598d 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -13,6 +13,11 @@
 #pragma implementation "mdi.h"
 #endif
 
 #pragma implementation "mdi.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#endif
+

 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"


@@ -44,7 +49,6 @@ extern void wxFrameFocusProc(Widget workArea, XtPointer clientData,
 
 #define wxID_NOTEBOOK_CLIENT_AREA wxID_HIGHEST + 100
 
 
 #define wxID_NOTEBOOK_CLIENT_AREA wxID_HIGHEST + 100
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxNotebook)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxNotebook)


@@ -61,7 +65,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook)
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)
 END_EVENT_TABLE()
 
     EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged)
 END_EVENT_TABLE()
 

-#endif // USE_SHARED_LIBRARY

 
 // Parent frame
 
 
 // Parent frame
 


@@ -660,10 +663,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)