Include wx/frame.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/cocoa/frame.mm

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/frame.mm
+// Name:        src/cocoa/frame.mm
 // Purpose:     wxFrame
 // Author:      David Elliott
 // Modified by:
@@ -10,10 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/frame.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
-    #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"
@@ -287,4 +289,3 @@ wxToolBar* wxFrame::CreateToolBar(long style,
 void wxFrame::PositionStatusBar()
 {
 }
-

src/common/framecmn.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/framecmn.cpp
+// Name:        src/common/framecmn.cpp
 // Purpose:     common (for all platforms) wxFrame functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
@@ -23,8 +23,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/frame.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"

src/common/tbarbase.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/tbarbase.cpp
+// Name:        src/common/tbarbase.cpp
 // Purpose:     wxToolBarBase implementation
 // Author:      Julian Smart
 // Modified by: VZ at 11.12.99 (wxScrollableToolBar split off)
@@ -26,19 +26,18 @@
 
 #if wxUSE_TOOLBAR
 
+#include "wx/toolbar.h"
+
 #ifndef WX_PRECOMP
     #include "wx/control.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
-
 #if wxUSE_IMAGE
     #include "wx/image.h"
     #include "wx/settings.h"
 #endif // wxUSE_IMAGE
 
-#include "wx/toolbar.h"
-
 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------

src/common/utilscmn.cpp

@@ -72,7 +72,6 @@
     #include "wx/colordlg.h"
     #include "wx/fontdlg.h"
     #include "wx/notebook.h"
-    #include "wx/frame.h"
     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 
@@ -819,7 +818,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
         {
             ConstStr255Param hint = 0;
             startSel = 0;
-            endSel = url.Length();
+            endSel = url.length();
             err = ICLaunchURL(inst, hint, url.fn_str(), endSel, &startSel, &endSel);
             if (err != noErr)
                 wxLogDebug(wxT("ICLaunchURL error %d"), (int) err);
@@ -1193,7 +1192,7 @@ wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wx
 
     wxColour colRet;
     wxColourDialog dialog(parent, &data);
-    if (!caption.IsEmpty())
+    if (!caption.empty())
         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {
@@ -1218,7 +1217,7 @@ wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxStrin
 
     wxFont fontRet;
     wxFontDialog dialog(parent, data);
-    if (!caption.IsEmpty())
+    if (!caption.empty())
         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {

src/generic/buttonbar.cpp

@@ -34,9 +34,9 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/image.h"
 #include "wx/settings.h"
 #include "wx/dcclient.h"
@@ -386,7 +386,7 @@ void wxButtonToolBar::DoLayout()
             {
                 wxBitmapButton* bmpButton = new wxBitmapButton(this, tool->GetId(), tool->GetNormalBitmap(), wxPoint(tool->m_x, tool->m_y), wxDefaultSize,
                                                                wxBU_AUTODRAW|wxBORDER_NONE);
-                if (!tool->GetShortHelp().IsEmpty())
+                if (!tool->GetShortHelp().empty())
                     bmpButton->SetLabel(tool->GetShortHelp());
 
                 tool->SetButton(bmpButton);
@@ -406,7 +406,7 @@ void wxButtonToolBar::DoLayout()
                 {
                     sz.y += (m_labelHeight + m_labelMargin);
 
-                    if (!tool->GetShortHelp().IsEmpty())
+                    if (!tool->GetShortHelp().empty())
                     {
                         wxClientDC dc(this);
                         dc.SetFont(GetFont());
@@ -515,7 +515,7 @@ void wxButtonToolBar::OnPaint(wxPaintEvent& event)
             dc.DrawRectangle(backgroundRect);
         }
 
-        if (m_labelHeight > 0 && !tool->GetShortHelp().IsEmpty())
+        if (m_labelHeight > 0 && !tool->GetShortHelp().empty())
         {
             int tw, th;
             dc.GetTextExtent(tool->GetShortHelp(), & tw, & th);

src/generic/statusbr.cpp

@@ -13,15 +13,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_STATUSBAR
 
 #ifndef WX_PRECOMP
-#include "wx/frame.h"
+    #include "wx/frame.h"
-#include "wx/settings.h"
+    #include "wx/settings.h"
-#include "wx/dcclient.h"
+    #include "wx/dcclient.h"
 #endif
 
 #ifdef __WXGTK20__

src/gtk/dialog.cpp

@@ -14,9 +14,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
-#include "wx/frame.h"
 #include "wx/cursor.h"
 #include "wx/evtloop.h"
 

src/gtk/glcanvas.cpp

@@ -18,9 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
-#include "wx/frame.h"
 #include "wx/colour.h"
 #include "wx/module.h"
 

src/gtk/popupwin.cpp

@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
-#include "wx/frame.h"
 #include "wx/cursor.h"
 
 #include <gdk/gdk.h>

src/gtk/radiobox.cpp

@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/dialog.h"
-#include "wx/frame.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"

src/gtk/taskbar.cpp

@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/menu.h"
 
 #include <gdk/gdkx.h>

src/gtk/tbargtk.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tbargtk.cpp
+// Name:        src/gtk/tbargtk.cpp
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase
@@ -23,7 +23,9 @@
 
 #if wxUSE_TOOLBAR_NATIVE
 
-#include "wx/frame.h"
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif
 
 // FIXME: Use GtkImage instead of GtkPixmap. Use the new toolbar API for when gtk runtime is new enough?
 // Beware that the new and old toolbar API may not be mixed in usage.

src/gtk/window.cpp

@@ -21,10 +21,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/dcclient.h"
-#include "wx/frame.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"

src/gtk1/dialog.cpp

@@ -14,9 +14,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
-#include "wx/frame.h"
 #include "wx/cursor.h"
 #include "wx/evtloop.h"
 

src/gtk1/glcanvas.cpp

@@ -18,9 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
-#include "wx/frame.h"
 #include "wx/colour.h"
 #include "wx/module.h"
 

src/gtk1/popupwin.cpp

@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
-#include "wx/frame.h"
 #include "wx/cursor.h"
 
 #include <gdk/gdk.h>

src/gtk1/radiobox.cpp

@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/dialog.h"
-#include "wx/frame.h"
 
 #include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>

src/gtk1/tbargtk.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tbargtk.cpp
+// Name:        src/gtk1/tbargtk.cpp
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase
@@ -23,7 +23,9 @@
 
 #if wxUSE_TOOLBAR_NATIVE
 
-#include "wx/frame.h"
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif
 
 #include <glib.h>
 #include "wx/gtk1/private.h"

src/gtk1/window.cpp

@@ -21,10 +21,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/dcclient.h"
-#include "wx/frame.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"

src/mac/carbon/app.cpp

@@ -18,9 +18,9 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"

src/mac/carbon/clipbrd.cpp

@@ -21,9 +21,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/metafile.h"
 

src/mac/carbon/dialog.cpp

@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
-#include "wx/frame.h"
 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"

src/mac/carbon/fontdlg.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlg.cpp
+// Name:        src/mac/carbon/fontdlg.cpp
 // Purpose:     wxFontDialog class for carbon 10.2+.
 // Author:      Ryan Norton
 // Modified by:
@@ -25,22 +25,22 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/intl.h"
+    #include "wx/intl.h"
-#include "wx/wxchar.h"
+    #include "wx/wxchar.h"
-#include "wx/dcclient.h"
+    #include "wx/dcclient.h"
-#include "wx/frame.h"
+    #include "wx/frame.h"
-#include "wx/textctrl.h"
+    #include "wx/textctrl.h"
-#include "wx/listbox.h"
+    #include "wx/listbox.h"
-#include "wx/checkbox.h"
+    #include "wx/checkbox.h"
-#include "wx/choice.h"
+    #include "wx/choice.h"
-#include "wx/sizer.h"
+    #include "wx/sizer.h"
-#include "wx/stattext.h"
+    #include "wx/stattext.h"
-#include "wx/button.h"
+    #include "wx/button.h"
 #endif
 
 #include "wx/fontdlg.h"
 #include "wx/dcclient.h"
-    
+
 #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
@@ -48,7 +48,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 #include "wx/mac/private.h"
 
 // ---------------------------------------------------------------------------
-// wxFontDialog  
+// wxFontDialog
 // ---------------------------------------------------------------------------
 
 static const EventTypeSpec eventList[] =
@@ -62,7 +62,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve
     OSStatus result = eventNotHandledErr ;
     wxFontDialog *fontdialog = (wxFontDialog*) userData ;
     wxFontData& fontdata= fontdialog->GetFontData() ;
-    
+
     wxMacCarbonEvent cEvent( event );
     switch(cEvent.GetKind())
     {
@@ -70,32 +70,32 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve
         {
             FMFont fontId = 0 ;
             if ( cEvent.GetParameter<ATSUFontID>(kEventParamATSUFontID, &fontId) == noErr )
-            {                
+            {
                 FMFontStyle fontStyle = cEvent.GetParameter<FMFontStyle>(kEventParamFMFontStyle);
                 FMFontSize fontSize = cEvent.GetParameter<FMFontSize>(kEventParamFMFontSize);
 
                 ByteCount actualLength = 0;
                 CFStringRef cfName = NULL;
                 char *c = NULL;
-                OSStatus err = ATSUFindFontName(fontId , kFontFamilyName, kFontUnicodePlatform, kFontNoScriptCode, 
+                OSStatus err = ATSUFindFontName(fontId , kFontFamilyName, kFontUnicodePlatform, kFontNoScriptCode,
                     kFontNoLanguageCode , 0 , NULL , &actualLength , NULL );
                 if ( err == noErr)
                 {
                     actualLength += 1 ;
                     char *c = (char*)malloc( actualLength );
-                    err = ATSUFindFontName(fontId, kFontFamilyName, kFontUnicodePlatform, kFontNoScriptCode, 
+                    err = ATSUFindFontName(fontId, kFontFamilyName, kFontUnicodePlatform, kFontNoScriptCode,
                         kFontNoLanguageCode, actualLength, c , NULL, NULL);
                     cfName = CFStringCreateWithCharacters(NULL, (UniChar*) c, (actualLength-1) >> 1);
                 }
                 else
                 {
-                    err = ATSUFindFontName(fontId , kFontFamilyName, kFontNoPlatformCode, kFontNoScriptCode, 
+                    err = ATSUFindFontName(fontId , kFontFamilyName, kFontNoPlatformCode, kFontNoScriptCode,
                     kFontNoLanguageCode , 0 , NULL , &actualLength , NULL );
                     if ( err == noErr )
                     {
                         actualLength += 1 ;
                         c = (char*)malloc(actualLength);
-                        err = ATSUFindFontName(fontId, kFontFamilyName, kFontNoPlatformCode, kFontNoScriptCode, 
+                        err = ATSUFindFontName(fontId, kFontFamilyName, kFontNoPlatformCode, kFontNoScriptCode,
                             kFontNoLanguageCode, actualLength, c , NULL, NULL);
                         c[actualLength-1] = 0;
                         cfName = CFStringCreateWithCString(NULL, c, kCFStringEncodingMacRoman );
@@ -103,7 +103,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve
                 }
                 if ( c!=NULL )
                     free(c);
-                
+
                 if ( cfName!=NULL )
                 {
                     fontdata.m_chosenFont.SetFaceName(wxMacCFStringHolder(cfName).AsString(wxLocale::GetSystemEncoding()));
@@ -153,7 +153,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve
         }
             break ;
     } ;
-    
+
     return result ;
 }
 
@@ -186,7 +186,7 @@ int wxFontDialog::ShowModal()
     {
         font = m_fontData.m_initialFont ;
     }
-    
+
     ATSUStyle style = (ATSUStyle)font.MacGetATSUStyle();
     err = SetFontInfoForSelection (kFontSelectionATSUIType,1, &style , NULL);
     // just clicking on ENTER will not send us any font setting event, therefore we have to make sure
@@ -197,13 +197,13 @@ int wxFontDialog::ShowModal()
 
     err = InstallApplicationEventHandler( GetwxMacCarbonFontPanelHandlerUPP(), GetEventTypeCount(eventList), eventList, this , &handler );
 
-    if ( !FPIsFontPanelVisible() ) 
+    if ( !FPIsFontPanelVisible() )
         FPShowHideFontPanel();
-    
+
     int retval = RunMixedFontDialog(this);
-    
+
     ::RemoveEventHandler(handler);
-    
+
     return retval ;
 }
 
@@ -326,11 +326,11 @@ void wxFontColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
             parent = parent->GetParent();
 
         wxColourData data;
-        data.SetChooseFull(TRUE);
+        data.SetChooseFull(true);
         data.SetColour(m_colour);
         wxColourDialog *dialog = new wxColourDialog(parent, &data);
         // Crashes on wxMac (no m_peer)
-#ifndef __WXMAC__                
+#ifndef __WXMAC__
         dialog->SetTitle(_("Background colour"));
 #endif
         if (dialog->ShowModal() == wxID_OK)
@@ -426,7 +426,7 @@ bool wxFontDialog::Create(wxWindow* parent, const wxFontData& fontData)
  */
 
 void wxFontDialog::CreateControls()
-{    
+{
     wxFontDialog* itemDialog1 = this;
 
     wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
@@ -488,12 +488,12 @@ void wxFontDialog::CreateControls()
             m_underlinedCtrl->SetToolTip(_("Check to make the font underlined."));
         itemBoxSizer11->Add(m_underlinedCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
     }
-    
+
     if (m_fontData.GetEnableEffects())
     {
         wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("Colour:"), wxDefaultPosition, wxDefaultSize, 0 );
         itemFlexGridSizer4->Add(itemStaticText15, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL|wxADJUST_MINSIZE, 5);
-        
+
         m_colourCtrl = new wxFontColourSwatchCtrl( itemDialog1, wxID_FONTDIALOG_COLOUR, wxDefaultPosition, wxSize(-1, 30), wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
         m_colourCtrl->SetHelpText(_("Click to change the font colour."));
         if (ShowToolTips())
@@ -670,7 +670,7 @@ void wxFontDialog::InitializeControls()
     m_boldCtrl->SetValue(m_dialogFont.GetWeight() == wxBOLD);
     m_italicCtrl->SetValue(m_dialogFont.GetStyle() == wxITALIC);
     m_sizeCtrl->SetValue(m_dialogFont.GetPointSize());
-    
+
     wxString facename = m_dialogFont.GetFaceName();
     if (facename.empty() || m_facenameCtrl->FindString(facename) == wxNOT_FOUND)
     {

src/mac/carbon/menu.cpp

@@ -25,11 +25,11 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
-#include "wx/frame.h"
 
 #include "wx/mac/uma.h"
 

src/mac/carbon/window.cpp

@@ -18,6 +18,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/menu.h"
@@ -30,7 +31,6 @@
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
-#include "wx/frame.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"

src/mac/classic/app.cpp

@@ -22,9 +22,9 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"

src/mac/classic/clipbrd.cpp

@@ -18,9 +18,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/metafile.h"
 

src/mac/classic/dialog.cpp

@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
-#include "wx/frame.h"
 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"

src/mac/classic/menu.cpp

@@ -25,10 +25,10 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/menuitem.h"
-#include "wx/frame.h"
 
 #include "wx/mac/uma.h"
 

src/mac/classic/window.cpp

@@ -18,6 +18,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/menu.h"
@@ -31,7 +32,6 @@
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
-#include "wx/frame.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"

src/motif/dcscreen.cpp

@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

src/motif/menu.cpp

@@ -26,10 +26,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/menuitem.h"
-#include "wx/frame.h"
 #include "wx/settings.h"
 
 #ifdef __VMS__

src/motif/menuitem.cpp

@@ -24,10 +24,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/menu.h"
-#include "wx/frame.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

src/motif/toolbar.cpp

@@ -28,11 +28,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/settings.h"
 #include "wx/timer.h"
-#include "wx/frame.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

src/motif/window.cpp

@@ -31,6 +31,7 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/menu.h"
@@ -39,7 +40,6 @@
 #include "wx/layout.h"
 #include "wx/button.h"
 #include "wx/settings.h"
-#include "wx/frame.h"
 #include "wx/scrolwin.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"

src/msw/dragimag.cpp

@@ -35,10 +35,10 @@
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/frame.h"
 #include "wx/image.h"
 
 #include "wx/msw/dragimag.h"

src/msw/frame.cpp

@@ -24,8 +24,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/frame.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/frame.h"
     #include "wx/app.h"
     #include "wx/menu.h"
     #include "wx/utils.h"

src/palmos/dragimag.cpp

@@ -21,7 +21,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_DRAGIMAGE
@@ -35,9 +35,9 @@
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/image.h"
 
 #include "wx/palmos/dragimag.h"

src/univ/framuniv.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        univ/frame.cpp
+// Name:        src/univ/frame.cpp
 // Purpose:     wxFrame class for wxUniversal
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
-    #include "wx/menu.h"
+#include "wx/frame.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/frame.h"
+    #include "wx/menu.h"
     #include "wx/statusbr.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"

src/univ/menu.cpp

@@ -32,12 +32,12 @@
     #include "wx/settings.h"
     #include "wx/accel.h"
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif // WX_PRECOMP
 
 #include "wx/popupwin.h"
 #include "wx/evtloop.h"
 #include "wx/dcclient.h"
-#include "wx/frame.h"
 
 #include "wx/univ/renderer.h"
 

src/univ/toolbar.cpp

@@ -33,11 +33,11 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/univ/renderer.h"
 
-#include "wx/frame.h"
 #include "wx/image.h"
 
 // ----------------------------------------------------------------------------

src/unix/taskbarx11.cpp

@@ -25,9 +25,9 @@
 
 #ifndef  WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/bitmap.h"
 #include "wx/statbmp.h"
 #include "wx/sizer.h"

src/x11/app.cpp

@@ -19,9 +19,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"

src/x11/dcscreen.cpp

@@ -18,9 +18,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/fontutil.h"
 
 #include "wx/x11/private.h"

src/x11/window.cpp

@@ -32,6 +32,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/menu.h"
@@ -43,7 +44,6 @@
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
-#include "wx/frame.h"
 #include "wx/scrolwin.h"
 #include "wx/scrolbar.h"
 #include "wx/module.h"

src/xrc/xh_dlg.cpp

@@ -22,10 +22,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
 #include "wx/dialog.h"
-#include "wx/frame.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 

src/xrc/xh_frame.cpp

@@ -22,9 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)

src/xrc/xh_menu.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_menu.cpp
+// Name:        src/xrc/xh_menu.cpp
 // Purpose:     XRC resource for menus and menubars
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
@@ -18,8 +18,12 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_menu.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif
+
 #include "wx/menu.h"
-#include "wx/frame.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
 
@@ -75,7 +79,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             wxString label = GetText(wxT("label"));
             wxString accel = GetText(wxT("accel"), false);
             wxString fullLabel = label;
-            if (!accel.IsEmpty())
+            if (!accel.empty())
                 fullLabel << wxT("\t") << accel;
 
             wxItemKind kind = wxITEM_NORMAL;

src/xrc/xh_panel.cpp

@@ -21,10 +21,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/panel.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
 
 wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()

src/xrc/xh_scwin.cpp

@@ -18,8 +18,12 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_scwin.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif
+
 #include "wx/scrolwin.h"
-#include "wx/frame.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
 

src/xrc/xh_statbar.cpp

@@ -22,9 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
+    #include "wx/frame.h"
 #endif
 
-#include "wx/frame.h"
 #include "wx/statusbr.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)

src/xrc/xh_toolb.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_toolb.cpp
+// Name:        src/xrc/xh_toolb.cpp
 // Purpose:     XRC resource for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
@@ -18,8 +18,12 @@
 #if wxUSE_XRC && wxUSE_TOOLBAR
 
 #include "wx/xrc/xh_toolb.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif
+
 #include "wx/toolbar.h"
-#include "wx/frame.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler)
 

src/xrc/xmlres.cpp

@@ -23,6 +23,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/panel.h"
+    #include "wx/frame.h"
 #endif
 
 #ifndef __WXWINCE__
@@ -30,7 +31,6 @@
 #endif
 
 #include "wx/dialog.h"
-#include "wx/frame.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"