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

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

diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index 90ff51a4ffc80115ef05aa9e5b067633213c0c11..fd61328157e5a456ea021afff7df00947edc6fdf 100644 (file)
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/frame.mm
+// Name:        src/cocoa/frame.mm

 // Purpose:     wxFrame
 // Author:      David Elliott
 // Modified by:
 // Purpose:     wxFrame
 // Author:      David Elliott
 // Modified by:


@@ -10,10 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/frame.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.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"
     #include "wx/menu.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"


@@ -287,4 +289,3 @@ wxToolBar* wxFrame::CreateToolBar(long style,
 void wxFrame::PositionStatusBar()
 {
 }
 void wxFrame::PositionStatusBar()
 {
 }

-

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 923fb49e2df6ea42f1cd600dd4fc1e53ff133710..31a955fede166c47840e15f8a3506ef6fff0d4a8 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/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
 // Purpose:     common (for all platforms) wxFrame functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97


@@ -23,8 +23,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/frame.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/frame.h"

     #include "wx/menu.h"
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/menuitem.h"
     #include "wx/dcclient.h"

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 85f121426b495034579917a51822c4d0d1dcc240..b67f6544a544b5fb57a503dd630dc6ed0bbee642 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/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)
 // Purpose:     wxToolBarBase implementation
 // Author:      Julian Smart
 // Modified by: VZ at 11.12.99 (wxScrollableToolBar split off)


@@ -26,19 +26,18 @@
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

+#include "wx/toolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/control.h"
 #ifndef WX_PRECOMP
     #include "wx/control.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"
-

 #if wxUSE_IMAGE
     #include "wx/image.h"
     #include "wx/settings.h"
 #endif // wxUSE_IMAGE
 
 #if wxUSE_IMAGE
     #include "wx/image.h"
     #include "wx/settings.h"
 #endif // wxUSE_IMAGE
 

-#include "wx/toolbar.h"
-

 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWidgets macros
 // ----------------------------------------------------------------------------

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 05f0ebd938aaf951de87d8eaaaa4d45da7d6db85..cf07a0a5c26eb02f61c2269a9586accc928743c3 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -72,7 +72,6 @@
     #include "wx/colordlg.h"
     #include "wx/fontdlg.h"
     #include "wx/notebook.h"
     #include "wx/colordlg.h"
     #include "wx/fontdlg.h"
     #include "wx/notebook.h"

-    #include "wx/frame.h"

     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 
     #include "wx/statusbr.h"
 #endif // wxUSE_GUI
 


@@ -819,7 +818,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
         {
             ConstStr255Param hint = 0;
             startSel = 0;
         {
             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);
             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);
 
     wxColour colRet;
     wxColourDialog dialog(parent, &data);

-    if (!caption.IsEmpty())
+    if (!caption.empty())

         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {
         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);
 
     wxFont fontRet;
     wxFontDialog dialog(parent, data);

-    if (!caption.IsEmpty())
+    if (!caption.empty())

         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {
         dialog.SetTitle(caption);
     if ( dialog.ShowModal() == wxID_OK )
     {

diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index b03090fb68fbc4c59b62128f3353551296597e26..e3c19e31443c06c06f188099162c7e560b09a7eb 100644 (file)
--- a/src/generic/buttonbar.cpp
+++ b/src/generic/buttonbar.cpp
@@ -34,9 +34,9 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/image.h"
 #include "wx/settings.h"
 #include "wx/dcclient.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);
             {
                 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);
                     bmpButton->SetLabel(tool->GetShortHelp());
 
                 tool->SetButton(bmpButton);


@@ -406,7 +406,7 @@ void wxButtonToolBar::DoLayout()
                 {
                     sz.y += (m_labelHeight + m_labelMargin);
 
                 {
                     sz.y += (m_labelHeight + m_labelMargin);
 

-                    if (!tool->GetShortHelp().IsEmpty())
+                    if (!tool->GetShortHelp().empty())

                     {
                         wxClientDC dc(this);
                         dc.SetFont(GetFont());
                     {
                         wxClientDC dc(this);
                         dc.SetFont(GetFont());


@@ -515,7 +515,7 @@ void wxButtonToolBar::OnPaint(wxPaintEvent& event)
             dc.DrawRectangle(backgroundRect);
         }
 
             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);
         {
             int tw, th;
             dc.GetTextExtent(tool->GetShortHelp(), & tw, & th);

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index b08f2f333747e8ac7f4e4a740192c8830fe85469..5517573f79a2bfd38e0644931d219c484457f61a 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -13,15 +13,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_STATUSBAR
 
 #ifndef WX_PRECOMP
 #endif
 
 #if wxUSE_STATUSBAR
 
 #ifndef WX_PRECOMP

-#include "wx/frame.h"
-#include "wx/settings.h"
-#include "wx/dcclient.h"
+    #include "wx/frame.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"

 #endif
 
 #ifdef __WXGTK20__
 #endif
 
 #ifdef __WXGTK20__

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 1464cc2563cf84e57e8549208dd50ae23fd59c19..81c8bc62490990d7aed89687866c3698e832d528 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -14,9 +14,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/frame.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/frame.h"

 #include "wx/cursor.h"
 #include "wx/evtloop.h"
 
 #include "wx/cursor.h"
 #include "wx/evtloop.h"
 

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 4ef6d70a22ff6ef9b942c62c5d446546a326f0ee..7d76807bfc9881f9f2995d1ededa83e01a18699b 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -18,9 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/frame.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/frame.h"

 #include "wx/colour.h"
 #include "wx/module.h"
 
 #include "wx/colour.h"
 #include "wx/module.h"
 

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 47a877cd71a05740909db92095ae6a2a34c4190c..843144ebaa456534586c1a0d63dc603271f5052b 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/frame.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/frame.h"

 #include "wx/cursor.h"
 
 #include <gdk/gdk.h>
 #include "wx/cursor.h"
 
 #include <gdk/gdk.h>

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 3d1785b0d3741993da3d9b54874d29ebed21f91d..938ca0d69cc8ae5e85880e8ef9e9bb5ed167bbd6 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/dialog.h"
 #endif
 
 #include "wx/dialog.h"

-#include "wx/frame.h"

 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 9d9232d7c9b8f90b772f6a22b837e94ef462134b..0ef04d1e44e67c5bbf0d3280dc509d644666f306 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/menu.h"
 
 #include <gdk/gdkx.h>
 #include "wx/menu.h"
 
 #include <gdk/gdkx.h>

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index ee9725a088ebc706e6ff932f5675cf4c54f29039..cbe4087f73f04cd57bcfcf1224635b7b0e3ea846 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/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
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase


@@ -23,7 +23,9 @@
 
 #if wxUSE_TOOLBAR_NATIVE
 
 
 #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.
 
 // 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.

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index eef601151db01c2eb75682c7fad6a28d41738e86..d7d79ebf1a2a0493bbfed6c08613095f1ca007a9 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -21,10 +21,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/dcclient.h"

-#include "wx/frame.h"

 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index eab01d62fd5b1aed502dba6f4b62e90dd3219b20..a58dcb55dbf94fa45a902fbb627e0c35bc9f773d 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -14,9 +14,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/frame.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/frame.h"

 #include "wx/cursor.h"
 #include "wx/evtloop.h"
 
 #include "wx/cursor.h"
 #include "wx/evtloop.h"
 

diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index 5d4bcc5c823c944fe52170facda4dcf0e5f32882..6fa3c8444b0c06d70049bd2eeb953f746e9174b7 100644 (file)
--- a/src/gtk1/glcanvas.cpp
+++ b/src/gtk1/glcanvas.cpp
@@ -18,9 +18,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/frame.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/frame.h"

 #include "wx/colour.h"
 #include "wx/module.h"
 
 #include "wx/colour.h"
 #include "wx/module.h"
 

diff --git a/src/gtk1/popupwin.cpp b/src/gtk1/popupwin.cpp
index 464ccd4bde0d3eb145bc6b4f7a0edd75dd54dd73..65d35e5c2216e54049900530f63c0aae7fca783c 100644 (file)
--- a/src/gtk1/popupwin.cpp
+++ b/src/gtk1/popupwin.cpp
@@ -16,9 +16,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/frame.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/frame.h"

 #include "wx/cursor.h"
 
 #include <gdk/gdk.h>
 #include "wx/cursor.h"
 
 #include <gdk/gdk.h>

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 83252b6c3739997618d067899e83dca96bc1605e..4e355e77a6abaf1f300b656aa609303658024185 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -16,10 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/dialog.h"
 #endif
 
 #include "wx/dialog.h"

-#include "wx/frame.h"

 
 #include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk1/private.h"
 #include <gdk/gdkkeysyms.h>

diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp
index b81c5c77ec5cb4e2ccee152884269334a5665291..71392ae7e526c4abec0cc6afde93b87a4870a391 100644 (file)
--- a/src/gtk1/tbargtk.cpp
+++ b/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
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // Modified:    13.12.99 by VZ to derive from wxToolBarBase


@@ -23,7 +23,9 @@
 
 #if wxUSE_TOOLBAR_NATIVE
 
 
 #if wxUSE_TOOLBAR_NATIVE
 

-#include "wx/frame.h"
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif

 
 #include <glib.h>
 #include "wx/gtk1/private.h"
 
 #include <glib.h>
 #include "wx/gtk1/private.h"

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 23578f743b40601c8478e511f212bc677696b0d9..78f316c9e9921d4f0f90ea441d5403db4f1e71e1 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -21,10 +21,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/dcclient.h"

-#include "wx/frame.h"

 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 3487a763de3f5c1f1c55a81c0bde4bfaa9dc9b3a..b133895c4922fc525095588ef5769e90c466ce15 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -18,9 +18,9 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/window.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index 18e8d90a5978c63b424578f632fa9e29631449cb..0b9c1a831d5c0cd61615b8e54afb974bf2017480 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/src/mac/carbon/clipbrd.cpp
@@ -21,9 +21,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/bitmap.h"
 #include "wx/metafile.h"
 
 #include "wx/bitmap.h"
 #include "wx/metafile.h"
 

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 69f568b9a501d1606c1e3b7379c1ae80dc847963..dee3c9239f2a90bdff7f5855f5a2cc2f253d4fa8 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/frame.h"

 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"
 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index 7ce9c5567881af5433baa4423b7e7f86996b84f3..90ccac923947a4c00fa8ff286036f6b9ce760a67 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/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:
 // Purpose:     wxFontDialog class for carbon 10.2+.
 // Author:      Ryan Norton
 // Modified by:


@@ -25,22 +25,22 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/intl.h"
-#include "wx/wxchar.h"
-#include "wx/dcclient.h"
-#include "wx/frame.h"
-#include "wx/textctrl.h"
-#include "wx/listbox.h"
-#include "wx/checkbox.h"
-#include "wx/choice.h"
-#include "wx/sizer.h"
-#include "wx/stattext.h"
-#include "wx/button.h"
+    #include "wx/intl.h"
+    #include "wx/wxchar.h"
+    #include "wx/dcclient.h"
+    #include "wx/frame.h"
+    #include "wx/textctrl.h"
+    #include "wx/listbox.h"
+    #include "wx/checkbox.h"
+    #include "wx/choice.h"
+    #include "wx/sizer.h"
+    #include "wx/stattext.h"
+    #include "wx/button.h"

 #endif
 
 #include "wx/fontdlg.h"
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/fontdlg.h"
 #include "wx/dcclient.h"

-    
+

 #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 #if wxMAC_USE_EXPERIMENTAL_FONTDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)


@@ -48,7 +48,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 #include "wx/mac/private.h"
 
 // ---------------------------------------------------------------------------
 #include "wx/mac/private.h"
 
 // ---------------------------------------------------------------------------

-// wxFontDialog  
+// wxFontDialog

 // ---------------------------------------------------------------------------
 
 static const EventTypeSpec eventList[] =
 // ---------------------------------------------------------------------------
 
 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() ;
     OSStatus result = eventNotHandledErr ;
     wxFontDialog *fontdialog = (wxFontDialog*) userData ;
     wxFontData& fontdata= fontdialog->GetFontData() ;

-    
+

     wxMacCarbonEvent cEvent( event );
     switch(cEvent.GetKind())
     {
     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 )
         {
             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;
                 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 );
                     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
                 {
                         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);
                     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 );
                             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 ( c!=NULL )
                     free(c);

-                
+

                 if ( cfName!=NULL )
                 {
                     fontdata.m_chosenFont.SetFaceName(wxMacCFStringHolder(cfName).AsString(wxLocale::GetSystemEncoding()));
                 if ( cfName!=NULL )
                 {
                     fontdata.m_chosenFont.SetFaceName(wxMacCFStringHolder(cfName).AsString(wxLocale::GetSystemEncoding()));


@@ -153,7 +153,7 @@ pascal OSStatus wxMacCarbonFontPanelHandler(EventHandlerCallRef nextHandler, Eve
         }
             break ;
     } ;
         }
             break ;
     } ;

-    
+

     return result ;
 }
 
     return result ;
 }
 


@@ -186,7 +186,7 @@ int wxFontDialog::ShowModal()
     {
         font = m_fontData.m_initialFont ;
     }
     {
         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
     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 );
 
 
     err = InstallApplicationEventHandler( GetwxMacCarbonFontPanelHandlerUPP(), GetEventTypeCount(eventList), eventList, this , &handler );
 

-    if ( !FPIsFontPanelVisible() ) 
+    if ( !FPIsFontPanelVisible() )

         FPShowHideFontPanel();
         FPShowHideFontPanel();

-    
+

     int retval = RunMixedFontDialog(this);
     int retval = RunMixedFontDialog(this);

-    
+

     ::RemoveEventHandler(handler);
     ::RemoveEventHandler(handler);

-    
+

     return retval ;
 }
 
     return retval ;
 }
 


@@ -326,11 +326,11 @@ void wxFontColourSwatchCtrl::OnMouseEvent(wxMouseEvent& event)
             parent = parent->GetParent();
 
         wxColourData data;
             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)
         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)
         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()
  */
 
 void wxFontDialog::CreateControls()

-{    
+{

     wxFontDialog* itemDialog1 = this;
 
     wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
     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);
     }
             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);
     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())
         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());
     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)
     {
     wxString facename = m_dialogFont.GetFaceName();
     if (facename.empty() || m_facenameCtrl->FindString(facename) == wxNOT_FOUND)
     {

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index fec068407db8b95a68e27063542ee7d5ea5ca203..e59bb00f778929f145bdd9533c17d97ae8135c14 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -25,11 +25,11 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #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"
 #endif
 
 #include "wx/menuitem.h"
 #include "wx/log.h"

-#include "wx/frame.h"

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index fedd13db5f2d07be11fcd3a91e00b2703bb4a6c8..9362c60100c74cef14bf34c8776694bb3501eca4 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -18,6 +18,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/panel.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"


@@ -30,7 +31,6 @@
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #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"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"

diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp
index f7359bc924de511878d2cecc91f7f68e701484fc..fec775419d8ff9db6c0bea23dbad8c3272ef3192 100644 (file)
--- a/src/mac/classic/app.cpp
+++ b/src/mac/classic/app.cpp
@@ -22,9 +22,9 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/window.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"
 #include "wx/button.h"
 #include "wx/gdicmn.h"
 #include "wx/pen.h"

diff --git a/src/mac/classic/clipbrd.cpp b/src/mac/classic/clipbrd.cpp
index 294e8d26312c910468f249b23e6019cc8de0c353..09bb87c8c1f90af7428682c0393a247cea79409f 100644 (file)
--- a/src/mac/classic/clipbrd.cpp
+++ b/src/mac/classic/clipbrd.cpp
@@ -18,9 +18,9 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/bitmap.h"
 #include "wx/metafile.h"
 
 #include "wx/bitmap.h"
 #include "wx/metafile.h"
 

diff --git a/src/mac/classic/dialog.cpp b/src/mac/classic/dialog.cpp
index 75a92a14f06decb90084eb5350a486633762a041..669c65e7139e5f113ba0784b5a2e30925b1c51de 100644 (file)
--- a/src/mac/classic/dialog.cpp
+++ b/src/mac/classic/dialog.cpp
@@ -16,9 +16,9 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/frame.h"

 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"
 #include "wx/settings.h"
 
 #include "wx/mac/uma.h"

diff --git a/src/mac/classic/menu.cpp b/src/mac/classic/menu.cpp
index 12cba13bf229cfb0c6951ed79b6dfbf38f2efbce..70287633aec16133ccb3b5d8c4dd7b6bc416fbeb 100644 (file)
--- a/src/mac/classic/menu.cpp
+++ b/src/mac/classic/menu.cpp
@@ -25,10 +25,10 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/menuitem.h"
 #endif
 
 #include "wx/menuitem.h"

-#include "wx/frame.h"

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 9e75de3d418c2a48850b987f8deff2c9144a70b7..2eefcc4804edff1b7c74daa5bcaa66022839a4cd 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -18,6 +18,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/panel.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"


@@ -31,7 +32,6 @@
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #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"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"

diff --git a/src/motif/dcscreen.cpp b/src/motif/dcscreen.cpp
index 10b0fb0acc657faf4573c72cfd9361e3e205dd8b..9186c5352f33d5f785e68b3a555b0c5207d8bfb1 100644 (file)
--- a/src/motif/dcscreen.cpp
+++ b/src/motif/dcscreen.cpp
@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/window.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"
-

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 7ea74148a6d1c0cf598207449448c4bb4e006939..52a8343fff1b2a6a878d854b750e5586d0dba367 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -26,10 +26,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/menuitem.h"
 #endif
 
 #include "wx/menuitem.h"

-#include "wx/frame.h"

 #include "wx/settings.h"
 
 #ifdef __VMS__
 #include "wx/settings.h"
 
 #ifdef __VMS__

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index a8a899d14090ae113320354e5243b450baef4b8a..f07b0a4b2b7520b5093ecd2a79280b67a6591949 100644 (file)
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -24,10 +24,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"

-#include "wx/frame.h"

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

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index 774358df502c232bc783ef95d177c9330de954a1..dc724b395eb881e05c6b3ad54ea847bf80635310 100644 (file)
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -28,11 +28,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/settings.h"
 #include "wx/timer.h"
 #endif
 
 #include "wx/settings.h"
 #include "wx/timer.h"

-#include "wx/frame.h"

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index e97cc2732b4b6629e9c82b1e8826a9ce005e0e5b..b4dcadb3f039cb802194d6fc56e17eb60ba94d25 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -31,6 +31,7 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"


@@ -39,7 +40,6 @@
 #include "wx/layout.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #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"
 #include "wx/scrolwin.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 01e42a155db3caa43780594aedcb59809363364a..75d271d05c8c51fbdbebb3c57ae9632f3d93abfb 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -35,10 +35,10 @@
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

-#include "wx/frame.h"

 #include "wx/image.h"
 
 #include "wx/msw/dragimag.h"
 #include "wx/image.h"
 
 #include "wx/msw/dragimag.h"

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 1d7e46da63b9d2be43810f30be4eec1757d78d28..41518eac1836baca1e467b7f33e3f0a49c175ec1 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -24,8 +24,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/frame.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/frame.h"

     #include "wx/app.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/menu.h"
     #include "wx/utils.h"

diff --git a/src/palmos/dragimag.cpp b/src/palmos/dragimag.cpp
index 67688416f82601d751d538c89a153362c27aeacd..b96507dd2358744dd9a0eabbfef518276f7b2a13 100644 (file)
--- a/src/palmos/dragimag.cpp
+++ b/src/palmos/dragimag.cpp
@@ -21,7 +21,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_DRAGIMAGE
 #endif
 
 #if wxUSE_DRAGIMAGE


@@ -35,9 +35,9 @@
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/image.h"
 
 #include "wx/palmos/dragimag.h"
 #include "wx/image.h"
 
 #include "wx/palmos/dragimag.h"

diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp
index c0e343411e2e97dd1cb1dc6abc6cd17ba55b96bc..2ce9b25aa46c9ee5941f8547be4aa4be2913f900 100644 (file)
--- a/src/univ/framuniv.cpp
+++ b/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:
 // Purpose:     wxFrame class for wxUniversal
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-    #include "wx/menu.h"
+#include "wx/frame.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/frame.h"
+    #include "wx/menu.h"

     #include "wx/statusbr.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"
     #include "wx/settings.h"
     #include "wx/toolbar.h"

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index c77350cc1e7b9c1f162027b3cdb64cede6831b3c..80023293d8314af45d79022ca1b4c637a1f5d665 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -32,12 +32,12 @@
     #include "wx/settings.h"
     #include "wx/accel.h"
     #include "wx/log.h"
     #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"
 #endif // WX_PRECOMP
 
 #include "wx/popupwin.h"
 #include "wx/evtloop.h"
 #include "wx/dcclient.h"

-#include "wx/frame.h"

 
 #include "wx/univ/renderer.h"
 
 
 #include "wx/univ/renderer.h"
 

diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index a284182dd50cdff8f90db35b7b5ac7b555fefd36..59891ba4ae2f35fa2220fb5ca916a4121b3f2411 100644 (file)
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -33,11 +33,11 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/univ/renderer.h"
 
 #endif
 
 #include "wx/univ/renderer.h"
 

-#include "wx/frame.h"

 #include "wx/image.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/image.h"
 
 // ----------------------------------------------------------------------------

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index b6ec00f160e4c20b0333e82af209e8b2aa9c4223..43bf60080ab21511a3f391db36a9fcd7f47fc6e8 100644 (file)
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -25,9 +25,9 @@
 
 #ifndef  WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef  WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/bitmap.h"
 #include "wx/statbmp.h"
 #include "wx/sizer.h"
 #include "wx/bitmap.h"
 #include "wx/statbmp.h"
 #include "wx/sizer.h"

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index e6ac52fd44d808efa44c70117783d25e76ca6e55..9bb85397335fbe2c3eefe7d1f155e59e4a23c54b 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -19,9 +19,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"

diff --git a/src/x11/dcscreen.cpp b/src/x11/dcscreen.cpp
index 8fb5786a5a82c9773591a0e9a111fcf6d535b83a..8bcb5f410b7437c2321efabdce6be362c582e42c 100644 (file)
--- a/src/x11/dcscreen.cpp
+++ b/src/x11/dcscreen.cpp
@@ -18,9 +18,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/window.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/fontutil.h"
 
 #include "wx/x11/private.h"
 #include "wx/fontutil.h"
 
 #include "wx/x11/private.h"

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 064f6ee64c889023fea9a27c3b000b7e5e602828..4042d79c7a0662bd27075d9adde5df5028e32569 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -32,6 +32,7 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/panel.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"


@@ -43,7 +44,6 @@
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #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"
 #include "wx/scrolwin.h"
 #include "wx/scrolbar.h"
 #include "wx/module.h"

diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index 95a930b86cc0ef3634161dc90e0b1dec436bec74..704ac90abf5e4df5dc6051787b88b7f50f2d8d53 100644 (file)
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -22,10 +22,10 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #include "wx/dialog.h"
 #endif
 
 #include "wx/dialog.h"

-#include "wx/frame.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index 5e6e91995cd9ac850726153e27c2b49d761551a3..a10f0d24cf605237a781222c44532dcb6871c112 100644 (file)
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -22,9 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
 #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 5b13b5be3c9d3d3979877febd0058a77e6940c0b..47e5494d7c2d2a4d012b263d50e121340df9df97 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/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
 // 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"
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_menu.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif
+

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

-#include "wx/frame.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
 
 
 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;
             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;
                 fullLabel << wxT("\t") << accel;
 
             wxItemKind kind = wxITEM_NORMAL;

diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index 1fceadd851726eefa3025f94002f9eee615681b1..04a21ddfbd9b2bf21099321ae0770b9c6ee00357 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -21,10 +21,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/panel.h"
 
 #ifndef WX_PRECOMP
     #include "wx/panel.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
 
 wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
 
 wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index 59988f784427e24069114d54d8fa80f23bac67f6..f205a72b7b146340574be65cba4aaead303585cf 100644 (file)
--- a/src/xrc/xh_scwin.cpp
+++ b/src/xrc/xh_scwin.cpp
@@ -18,8 +18,12 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_scwin.h"
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_scwin.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif
+

 #include "wx/scrolwin.h"
 #include "wx/scrolwin.h"

-#include "wx/frame.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index a678ea94951adcd0555daad086af19787cc08f33..e634adc9915f5adde4da006fe236df90ee8593c0 100644 (file)
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -22,9 +22,9 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#include "wx/frame.h"

 #include "wx/statusbr.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
 #include "wx/statusbr.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index 62dd7707167d33def5047c7b418204d45c3809fd..7c1f0fa055483f260242088e3b80819ce24aa09c 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/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
 // 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"
 #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/toolbar.h"

-#include "wx/frame.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler)
 

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 3fedc644687164b25ac93e8ed0523f6845a0378a..e8d66785f7c45e06fc305d995597c166504f8e71 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -23,6 +23,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/panel.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/panel.h"

+    #include "wx/frame.h"

 #endif
 
 #ifndef __WXWINCE__
 #endif
 
 #ifndef __WXWINCE__


@@ -30,7 +31,6 @@
 #endif
 
 #include "wx/dialog.h"
 #endif
 
 #include "wx/dialog.h"

-#include "wx/frame.h"

 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"