Minor header cleaning.

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

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 1dd473c76e112126ac9e077062076012d72c292c..09894eea98dfcd3f726b9d0e898bb98ab22bd1f9 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,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "mdi.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,9 +18,12 @@
 #endif
 
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"

-#include "wx/menu.h"
-#include "wx/settings.h"
-#include "wx/icon.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


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

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

 {
     // TODO
 }
 {
     // TODO
 }


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


@@ -314,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);
             }
         }