Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/palmos/mdi.cpp b/src/palmos/mdi.cpp
index 69dc5e5421f3ceb6cf2f914755276cb5cee90fda..23385f32ef643323076247075f0dfabf6c874fd7 100644 (file)
--- a/src/palmos/mdi.cpp
+++ b/src/palmos/mdi.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "mdi.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,34 +24,29 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_MDI && !defined(__WXUNIVERSAL__)
+#if wxUSE_MDI
+
+#include "wx/mdi.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/setup.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
-    #if wxUSE_STATUSBAR
-        #include "wx/statusbr.h"
-    #endif
+    #include "wx/statusbr.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/toolbar.h"
 #endif
 
-#include "wx/mdi.h"
 #include "wx/palmos/private.h"
 
 #if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
     #include "wx/palmos/statbr95.h"
 #endif
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
 #include <string.h>
 
 // ---------------------------------------------------------------------------
@@ -137,7 +128,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_SIZE(wxMDIParentFrame::OnSize)
-    EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
@@ -201,12 +191,6 @@ wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
     return new wxMDIClientWindow;
 }
 
-// Responds to colour changes, and passes event on to children.
-void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    event.Skip();
-}
-
 WXHICON wxMDIParentFrame::GetDefaultIcon() const
 {
     // we don't have any standard icons (any more)
@@ -248,16 +232,6 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,
     return 0;
 }
 
-bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate)
-{
-    return false;
-}
-
-bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
-{
-    return false;
-}
-
 WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message,
                                         WXWPARAM wParam,
                                         WXLPARAM lParam)
@@ -340,11 +314,6 @@ WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message,
     return 0;
 }
 
-bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
-{
-    return false;
-}
-
 bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
                                         WXHWND hwndAct,
                                         WXHWND hwndDeact)
@@ -357,11 +326,6 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
     return false;
 }
 
-bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
-{
-    return false;
-}
-
 // ---------------------------------------------------------------------------
 // MDI specific message translation/preprocessing
 // ---------------------------------------------------------------------------
@@ -437,5 +401,4 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
 {
 }
 
-#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)
-
+#endif // wxUSE_MDI