Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-05 08:10:55 +00:00
parent 6337cacce9
commit 76b49cf49b
53 changed files with 127 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cocoa/frame.mm
View File

@@ -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()
{
}

5
src/common/framecmn.cpp
View File

@@ -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
#ifndef WX_PRECOMP
#include "wx/frame.h"
#ifndef WX_PRECOMP
#include "wx/menu.h"
#include "wx/menuitem.h"
#include "wx/dcclient.h"

9
src/common/tbarbase.cpp
View File

@@ -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"
#endif
#include "wx/frame.h"
#endif
#if wxUSE_IMAGE
#include "wx/image.h"
#include "wx/settings.h"
#endif // wxUSE_IMAGE
#include "wx/toolbar.h"
// ----------------------------------------------------------------------------
// wxWidgets macros
// ----------------------------------------------------------------------------

7
src/common/utilscmn.cpp
View File

@@ -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 )
{

8
src/generic/buttonbar.cpp
View File

@@ -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);

2
src/gtk/dialog.cpp
View File

@@ -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"

2
src/gtk/glcanvas.cpp
View File

@@ -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"

2
src/gtk/popupwin.cpp
View File

@@ -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>

2
src/gtk/radiobox.cpp
View File

@@ -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"

2
src/gtk/taskbar.cpp
View File

@@ -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>

4
src/gtk/tbargtk.cpp
View File

@@ -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
#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.

2
src/gtk/window.cpp
View File

@@ -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"

2
src/gtk1/dialog.cpp
View File

@@ -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"

2
src/gtk1/glcanvas.cpp
View File

@@ -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"

2
src/gtk1/popupwin.cpp
View File

@@ -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>

2
src/gtk1/radiobox.cpp
View File

@@ -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>

4
src/gtk1/tbargtk.cpp
View File

@@ -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
#ifndef WX_PRECOMP
#include "wx/frame.h"
#endif
#include <glib.h>
#include "wx/gtk1/private.h"

2
src/gtk1/window.cpp
View File

@@ -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"

2
src/mac/carbon/app.cpp
View File

@@ -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"

2
src/mac/carbon/clipbrd.cpp
View File

@@ -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"

2
src/mac/carbon/dialog.cpp
View File

@@ -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"

4
src/mac/carbon/fontdlg.cpp
View File

@@ -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:
@@ -326,7 +326,7 @@ 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)

2
src/mac/carbon/menu.cpp
View File

@@ -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"

2
src/mac/carbon/window.cpp
View File

@@ -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"

2
src/mac/classic/app.cpp
View File

@@ -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"

2
src/mac/classic/clipbrd.cpp
View File

@@ -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"

2
src/mac/classic/dialog.cpp
View File

@@ -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"

2
src/mac/classic/menu.cpp
View File

@@ -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"

2
src/mac/classic/window.cpp
View File

@@ -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"

3
src/motif/dcscreen.cpp
View File

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

2
src/motif/menu.cpp
View File

@@ -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__

2
src/motif/menuitem.cpp
View File

@@ -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

2
src/motif/toolbar.cpp
View File

@@ -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

2
src/motif/window.cpp
View File

@@ -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"

2
src/msw/dragimag.cpp
View File

@@ -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"

3
src/msw/frame.cpp
View File

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

2
src/palmos/dragimag.cpp
View File

@@ -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"

7
src/univ/framuniv.cpp
View File

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

2
src/univ/menu.cpp
View File

@@ -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"

2
src/univ/toolbar.cpp
View File

@@ -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"
// ----------------------------------------------------------------------------

2
src/unix/taskbarx11.cpp
View File

@@ -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"

2
src/x11/app.cpp
View File

@@ -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"

2
src/x11/dcscreen.cpp
View File

@@ -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"

2
src/x11/window.cpp
View File

@@ -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"

2
src/xrc/xh_dlg.cpp
View File

@@ -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)

2
src/xrc/xh_frame.cpp
View File

@@ -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)

10
src/xrc/xh_menu.cpp
View File

@@ -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"
#include "wx/menu.h"
#ifndef WX_PRECOMP
#include "wx/frame.h"
#endif
#include "wx/menu.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;

3
src/xrc/xh_panel.cpp
View File

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

6
src/xrc/xh_scwin.cpp
View File

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

2
src/xrc/xh_statbar.cpp
View File

@@ -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)

8
src/xrc/xh_toolb.cpp
View File

@@ -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"
#include "wx/toolbar.h"
#ifndef WX_PRECOMP
#include "wx/frame.h"
#endif
#include "wx/toolbar.h"
IMPLEMENT_DYNAMIC_CLASS(wxToolBarXmlHandler, wxXmlResourceHandler)

2
src/xrc/xmlres.cpp
View File

@@ -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"