From f4ec6bd20af5fe4687964644b56fe10071da15e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 10 Feb 2006 11:59:52 +0000 Subject: [PATCH] Use 'wx/' for contrib samples and make wxTinderbox properly rebuilded after commits in core headers. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/applet/dialogs_wdr.h | 20 +++++++++--------- .../gizmos/dynsash_switch/dynsash_switch.cpp | 16 +++++++------- contrib/samples/ogl/ogledit/doc.cpp | 6 +++--- contrib/samples/ogl/ogledit/doc.h | 14 ++++++------- contrib/samples/ogl/ogledit/ogledit.cpp | 4 ++-- contrib/samples/ogl/ogledit/ogledit.h | 6 +++--- contrib/samples/ogl/ogledit/palette.cpp | 7 +++---- contrib/samples/ogl/ogledit/palette.h | 10 ++++----- contrib/samples/ogl/ogledit/view.cpp | 6 +++--- contrib/samples/ogl/ogledit/view.h | 4 ++-- contrib/samples/ogl/studio/cspalette.cpp | 6 +++--- contrib/samples/ogl/studio/cspalette.h | 8 +++---- contrib/samples/ogl/studio/csprint.cpp | 12 +++++------ contrib/samples/ogl/studio/dialogs.cpp | 8 +++---- contrib/samples/ogl/studio/dialogs.h | 10 ++++----- contrib/samples/ogl/studio/doc.cpp | 7 +++---- contrib/samples/ogl/studio/doc.h | 10 ++++----- contrib/samples/ogl/studio/mainfrm.h | 7 +++---- contrib/samples/ogl/studio/project.h | 9 ++++---- contrib/samples/ogl/studio/shapes.cpp | 7 +++---- contrib/samples/ogl/studio/shapes.h | 16 +++++++------- contrib/samples/ogl/studio/studio.h | 21 +++++++++---------- contrib/samples/ogl/studio/symbols.cpp | 9 ++++---- contrib/samples/ogl/studio/symbols.h | 10 ++++----- contrib/samples/ogl/studio/view.cpp | 12 +++++------ contrib/samples/ogl/studio/view.h | 4 ++-- contrib/samples/stc/edit.cpp | 4 ++-- contrib/samples/stc/prefs.cpp | 4 ++-- contrib/samples/stc/stctest.cpp | 4 ++-- samples/stc/edit.cpp | 4 ++-- samples/stc/prefs.cpp | 4 ++-- samples/stc/stctest.cpp | 4 ++-- 32 files changed, 131 insertions(+), 142 deletions(-) diff --git a/contrib/samples/applet/dialogs_wdr.h b/contrib/samples/applet/dialogs_wdr.h index 3faba601c9..45a13e7cbe 100644 --- a/contrib/samples/applet/dialogs_wdr.h +++ b/contrib/samples/applet/dialogs_wdr.h @@ -9,17 +9,17 @@ // Include wxWindows' headers #ifndef WX_PRECOMP - #include + #include "wx/wx.h" #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include "wx/image.h" +#include "wx/statline.h" +#include "wx/spinbutt.h" +#include "wx/spinctrl.h" +#include "wx/splitter.h" +#include "wx/listctrl.h" +#include "wx/treectrl.h" +#include "wx/notebook.h" // Declare window functions @@ -29,7 +29,7 @@ #define ID_TEXTCTRL_MDL 20 #define ID_LISTBOX_MFTR 11 #define ID_LISTBOX_MDL 21 -wxSizer *MonitorDialogFunc( wxPanel *parent, bool call_fit = TRUE, bool set_sizer = TRUE ); +wxSizer *MonitorDialogFunc( wxPanel *parent, bool call_fit = true, bool set_sizer = true ); // Declare bitmap functions diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp index 2398439427..cfc5fba0b9 100644 --- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp +++ b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dynsash_switch.cpp +// Name: contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp // Purpose: Test custom scrollbar handling of wxDynamicSashWindow by // creating a dynamic sash window where the client scrolls a // a subwindow of the client window by responding to scroll @@ -25,13 +25,13 @@ #include "wx/wx.h" #endif -#include -#include -#include -#include -#include -#include -#include +#include "wx/app.h" +#include "wx/frame.h" +#include "wx/choice.h" +#include "wx/dcclient.h" +#include "wx/gizmos/dynamicsash.h" +#include "wx/layout.h" +#include "wx/scrolbar.h" class SwitchDemo : public wxApp { public: diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp index 5d67e7e068..9759405727 100644 --- a/contrib/samples/ogl/ogledit/doc.cpp +++ b/contrib/samples/ogl/ogledit/doc.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: doc.cpp +// Name: contrib/samples/ogl/ogledit/doc.cpp // Purpose: Implements document functionality in OGLEdit // Author: Julian Smart // Modified by: @@ -17,10 +17,10 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include +#include "wx/ioswrap.h" #if !wxUSE_DOC_VIEW_ARCHITECTURE #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h! diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h index 68fe372062..912d81c15b 100644 --- a/contrib/samples/ogl/ogledit/doc.h +++ b/contrib/samples/ogl/ogledit/doc.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: doc.h +// Name: contrib/samples/ogl/ogledit/doc.h // Purpose: Document classes // Author: Julian Smart // Modified by: @@ -12,17 +12,17 @@ #ifndef _OGLSAMPLE_DOC_H_ #define _OGLSAMPLE_DOC_H_ -#include -#include -#include +#include "wx/docview.h" +#include "wx/cmdproc.h" +#include "wx/string.h" -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif -#include +#include "wx/ogl/ogl.h" #if wxUSE_STD_IOSTREAM #include diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp index 62dc84a886..8c0263ed09 100644 --- a/contrib/samples/ogl/ogledit/ogledit.cpp +++ b/contrib/samples/ogl/ogledit/ogledit.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: ogledit.cpp +// Name: contrib/samples/ogl/ogledit/ogledit.cpp // Purpose: OGLEdit sample app // Author: Julian Smart // Modified by: @@ -17,7 +17,7 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if !wxUSE_DOC_VIEW_ARCHITECTURE diff --git a/contrib/samples/ogl/ogledit/ogledit.h b/contrib/samples/ogl/ogledit/ogledit.h index 4b6a447389..804ba67e4f 100644 --- a/contrib/samples/ogl/ogledit/ogledit.h +++ b/contrib/samples/ogl/ogledit/ogledit.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: ogledit.h +// Name: contrib/samples/ogl/ogledit/ogledit.h // Purpose: OGL sample // Author: Julian Smart // Modified by: @@ -12,8 +12,8 @@ #ifndef _OGLSAMPLE_OGLEDIT_H_ #define _OGLSAMPLE_OGLEDIT_H_ -#include -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/docview.h" +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h // Define a new application class MyFrame; diff --git a/contrib/samples/ogl/ogledit/palette.cpp b/contrib/samples/ogl/ogledit/palette.cpp index abae590623..30adc96717 100644 --- a/contrib/samples/ogl/ogledit/palette.cpp +++ b/contrib/samples/ogl/ogledit/palette.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.cpp +// Name: samples/ogl/ogledit/palette.cpp // Purpose: OGLEdit palette // Author: Julian Smart // Modified by: @@ -17,10 +17,10 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include +#include "wx/toolbar.h" #include #include @@ -101,4 +101,3 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent) palette->currentlySelected = PALETTE_ARROW; return palette; } - diff --git a/contrib/samples/ogl/ogledit/palette.h b/contrib/samples/ogl/ogledit/palette.h index c997e51711..a65c2b8627 100644 --- a/contrib/samples/ogl/ogledit/palette.h +++ b/contrib/samples/ogl/ogledit/palette.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.h +// Name: contrib/samples/ogl/ogledit/palette.h // Purpose: OGL sample palette // Author: Julian Smart // Modified by: @@ -12,10 +12,10 @@ #ifndef _OGLSAMPLE_PALETTE_H_ #define _OGLSAMPLE_PALETTE_H_ -#include -#include -#include -#include +#include "wx/wx.h" +#include "wx/string.h" +#include "wx/deprecated/setup.h" +#include "wx/deprecated/tbarsmpl.h" /* * Object editor tool palette diff --git a/contrib/samples/ogl/ogledit/view.cpp b/contrib/samples/ogl/ogledit/view.cpp index 4ada8beebe..c8661fc380 100644 --- a/contrib/samples/ogl/ogledit/view.cpp +++ b/contrib/samples/ogl/ogledit/view.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: view.cpp +// Name: contrib/samples/ogl/ogledit/view.cpp // Purpose: Implements view functionality in OGLEdit // Author: Julian Smart // Modified by: @@ -17,10 +17,10 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include +#include "wx/colordlg.h" #if !wxUSE_DOC_VIEW_ARCHITECTURE #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h! diff --git a/contrib/samples/ogl/ogledit/view.h b/contrib/samples/ogl/ogledit/view.h index 32c2706aa0..363696eb0e 100644 --- a/contrib/samples/ogl/ogledit/view.h +++ b/contrib/samples/ogl/ogledit/view.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: view.h +// Name: contrib/samples/ogl/ogledit/view.h // Purpose: View-related classes // Author: Julian Smart // Modified by: @@ -13,7 +13,7 @@ #define _OGLSAMPLE_VIEW_H_ #include "doc.h" -#include +#include "wx/ogl/ogl.h" class MyCanvas: public wxShapeCanvas { diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp index 8879747efc..3eb05d3b8a 100644 --- a/contrib/samples/ogl/studio/cspalette.cpp +++ b/contrib/samples/ogl/studio/cspalette.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cspalette.cpp +// Name: contrib/samples/ogl/studio/cspalette.cpp // Purpose: OGLEdit palette // Author: Julian Smart // Modified by: @@ -17,10 +17,10 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include +#include "wx/laywin.h" #include #include diff --git a/contrib/samples/ogl/studio/cspalette.h b/contrib/samples/ogl/studio/cspalette.h index 3da2e41f25..15f34157bd 100644 --- a/contrib/samples/ogl/studio/cspalette.h +++ b/contrib/samples/ogl/studio/cspalette.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cspalette.h +// Name: contrib/samples/ogl/studio/cspalette.h // Purpose: OGL sample palette // Author: Julian Smart // Modified by: @@ -12,9 +12,9 @@ #ifndef _STUDIO_CSPALETTE_H_ #define _STUDIO_CSPALETTE_H_ -#include -#include -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/wx.h" +#include "wx/string.h" +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h /* * Object editor tool palette diff --git a/contrib/samples/ogl/studio/csprint.cpp b/contrib/samples/ogl/studio/csprint.cpp index beec3c1db6..862d0deaba 100644 --- a/contrib/samples/ogl/studio/csprint.cpp +++ b/contrib/samples/ogl/studio/csprint.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: csprint.cpp +// Name: contrib/samples/ogl/studio/csprint.cpp // Purpose: Printing and clipboard functionality // Author: Julian Smart // Modified by: @@ -17,15 +17,15 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h -#include +#include "wx/clipbrd.h" #ifdef __WXMSW__ -#include +#include "wx/metafile.h" #endif #include "studio.h" @@ -318,5 +318,3 @@ bool csDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxD return true; } - - diff --git a/contrib/samples/ogl/studio/dialogs.cpp b/contrib/samples/ogl/studio/dialogs.cpp index b19ebd5402..8b61d315f3 100644 --- a/contrib/samples/ogl/studio/dialogs.cpp +++ b/contrib/samples/ogl/studio/dialogs.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialogs.cpp +// Name: contrib/samples/ogl/studio/dialogs.cpp // Purpose: Implements Studio dialogs // Author: Julian Smart // Modified by: // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". @@ -17,7 +17,7 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #include "dialogs.h" @@ -530,5 +530,3 @@ END_EVENT_TABLE() csTextBoxDialog::csTextBoxDialog() { } - - diff --git a/contrib/samples/ogl/studio/dialogs.h b/contrib/samples/ogl/studio/dialogs.h index da46fb7145..10622f43a3 100644 --- a/contrib/samples/ogl/studio/dialogs.h +++ b/contrib/samples/ogl/studio/dialogs.h @@ -1,21 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialogs.h +// Name: contrib/samples/ogl/studio/dialogs.h // Purpose: Miscellaneous dialogs // Author: Julian Smart // Modified by: // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _STUDIO_DIALOGS_H_ #define _STUDIO_DIALOGS_H_ -#include -#include +#include "wx/wx.h" +#include "wx/notebook.h" -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h #if wxUSE_WX_RESOURCES diff --git a/contrib/samples/ogl/studio/doc.cpp b/contrib/samples/ogl/studio/doc.cpp index 4af72a6ad4..ed0a3a88d8 100644 --- a/contrib/samples/ogl/studio/doc.cpp +++ b/contrib/samples/ogl/studio/doc.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: doc.cpp +// Name: contrib/samples/ogl/studio/doc.cpp // Purpose: Implements document functionality // Author: Julian Smart // Modified by: @@ -17,13 +17,13 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #include "studio.h" #include "doc.h" #include "view.h" -#include +#include "wx/ogl/basicp.h" IMPLEMENT_DYNAMIC_CLASS(csDiagramDocument, wxDocument) @@ -591,4 +591,3 @@ bool csCommandState::Undo() return true; } - diff --git a/contrib/samples/ogl/studio/doc.h b/contrib/samples/ogl/studio/doc.h index faefa53caf..5cd29aecdf 100644 --- a/contrib/samples/ogl/studio/doc.h +++ b/contrib/samples/ogl/studio/doc.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: doc.h +// Name: contrib/samples/ogl/studio/doc.h // Purpose: Document classes // Author: Julian Smart // Modified by: @@ -12,11 +12,11 @@ #ifndef _STUDIO_DOC_H_ #define _STUDIO_DOC_H_ -#include -#include -#include +#include "wx/docview.h" +#include "wx/cmdproc.h" +#include "wx/string.h" -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h #include "shapes.h" diff --git a/contrib/samples/ogl/studio/mainfrm.h b/contrib/samples/ogl/studio/mainfrm.h index 9200fc2c4c..3f4be7ec82 100644 --- a/contrib/samples/ogl/studio/mainfrm.h +++ b/contrib/samples/ogl/studio/mainfrm.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mainfrm.h +// Name: contrib/samples/ogl/studio/mainfrm.h // Purpose: Studio main window class // Author: Julian Smart // Modified by: // Created: 27/7/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _STUDIO_MAINFRM_H_ #define _STUDIO_MAINFRM_H_ -#include +#include "wx/docmdi.h" class wxSashLayoutWindow; class wxSashEvent; @@ -52,4 +52,3 @@ DECLARE_EVENT_TABLE() #endif // _STUDIO_MAINFRM_H_ - diff --git a/contrib/samples/ogl/studio/project.h b/contrib/samples/ogl/studio/project.h index 44cb15b8c7..2d0969e0c9 100644 --- a/contrib/samples/ogl/studio/project.h +++ b/contrib/samples/ogl/studio/project.h @@ -1,19 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: project.h +// Name: contrib/samples/ogl/studio/project.h // Purpose: Studio project classes // Author: Julian Smart // Modified by: // Created: 27/7/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _STUDIO_PROJECT_H_ #define _STUDIO_PROJECT_H_ -#include -#include +#include "wx/treectrl.h" +#include "wx/imaglist.h" /* * This is the project tree control. @@ -39,4 +39,3 @@ DECLARE_EVENT_TABLE() #endif // _STUDIO_PROJECT_H_ - diff --git a/contrib/samples/ogl/studio/shapes.cpp b/contrib/samples/ogl/studio/shapes.cpp index ceac152fdd..e7125a4a24 100644 --- a/contrib/samples/ogl/studio/shapes.cpp +++ b/contrib/samples/ogl/studio/shapes.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: shapes.cpp +// Name: contrib/samples/ogl/studio/shapes.cpp // Purpose: Implements Studio shapes // Author: Julian Smart // Modified by: @@ -17,14 +17,14 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if !wxUSE_DOC_VIEW_ARCHITECTURE #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h! #endif -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h #include "studio.h" #include "doc.h" @@ -1195,4 +1195,3 @@ void ShapeEditMenu::OnCommand(wxCommandEvent& event) { studioShapeEditProc(*this, event); } - diff --git a/contrib/samples/ogl/studio/shapes.h b/contrib/samples/ogl/studio/shapes.h index dbda6fa11f..7f4548ba38 100644 --- a/contrib/samples/ogl/studio/shapes.h +++ b/contrib/samples/ogl/studio/shapes.h @@ -1,23 +1,23 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: shapes.h +// Name: contrib/samples/ogl/studio/shapes.h // Purpose: Shape classes // Author: Julian Smart // Modified by: // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _STUDIO_SHAPES_H_ #define _STUDIO_SHAPES_H_ -#include -#include -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h -#include -#include -#include +#include "wx/docview.h" +#include "wx/string.h" +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/ogl/basicp.h" +#include "wx/ogl/linesp.h" +#include "wx/ogl/drawn.h" class csDiagramDocument; diff --git a/contrib/samples/ogl/studio/studio.h b/contrib/samples/ogl/studio/studio.h index 7d36cf0a4f..c23652ad89 100644 --- a/contrib/samples/ogl/studio/studio.h +++ b/contrib/samples/ogl/studio/studio.h @@ -1,29 +1,29 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: Studio.h +// Name: contrib/samples/ogl/studio/studio.h // Purpose: Studio application class // Author: Julian Smart // Modified by: // Created: 27/7/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _STUDIO_STUDIO_H_ #define _STUDIO_STUDIO_H_ -#include -#include -#include -#include +#include "wx/docmdi.h" +#include "wx/help.h" +#include "wx/cshelp.h" +#include "wx/helphtml.h" #ifdef __WXMSW__ - #include + #include "wx/msw/helpchm.h" #else - #include + #include "wx/html/helpctrl.h" #endif -#include -#include +#include "wx/ogl/ogl.h" +#include "wx/ogl/canvas.h" #include "shapes.h" class csEditorToolPalette; @@ -175,4 +175,3 @@ DECLARE_APP(csApp) #endif // _STUDIO_STUDIO_H_ - diff --git a/contrib/samples/ogl/studio/symbols.cpp b/contrib/samples/ogl/studio/symbols.cpp index 71d6fce886..5aaffd6816 100644 --- a/contrib/samples/ogl/studio/symbols.cpp +++ b/contrib/samples/ogl/studio/symbols.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: symbols.cpp +// Name: contrib/samples/ogl/studio/symbols.cpp // Purpose: Implements the Studio symbol database // Author: Julian Smart // Modified by: // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". @@ -17,10 +17,10 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h #include "studio.h" #include "doc.h" @@ -215,4 +215,3 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too return newBitmap; } - diff --git a/contrib/samples/ogl/studio/symbols.h b/contrib/samples/ogl/studio/symbols.h index 405ea52626..8ee823780f 100644 --- a/contrib/samples/ogl/studio/symbols.h +++ b/contrib/samples/ogl/studio/symbols.h @@ -1,21 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: symbols.h +// Name: contrib/samples/ogl/studio/symbols.h // Purpose: Symbol classes (symbol database) // Author: Julian Smart // Modified by: // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _STUDIO_SYMBOLS_H_ #define _STUDIO_SYMBOLS_H_ -#include -#include +#include "wx/docview.h" +#include "wx/string.h" -#include // base header of OGL, includes and adjusts wx/deprecated/setup.h +#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h /* * csSymbol diff --git a/contrib/samples/ogl/studio/view.cpp b/contrib/samples/ogl/studio/view.cpp index 9ce1d68423..8a5e625c62 100644 --- a/contrib/samples/ogl/studio/view.cpp +++ b/contrib/samples/ogl/studio/view.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: view.cpp +// Name: contrib/samples/ogl/studio/view.cpp // Purpose: Implements view functionality // Author: Julian Smart // Modified by: // Created: 12/07/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". @@ -17,10 +17,10 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include +#include "wx/colordlg.h" #if !wxUSE_DOC_VIEW_ARCHITECTURE #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h! @@ -32,8 +32,8 @@ #include "cspalette.h" #include "symbols.h" #include "dialogs.h" -#include -#include +#include "wx/ogl/basicp.h" +#include "wx/ogl/linesp.h" IMPLEMENT_DYNAMIC_CLASS(csDiagramView, wxView) diff --git a/contrib/samples/ogl/studio/view.h b/contrib/samples/ogl/studio/view.h index a58f3391ed..c3fc46c3f3 100644 --- a/contrib/samples/ogl/studio/view.h +++ b/contrib/samples/ogl/studio/view.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: view.h +// Name: contrib/samples/ogl/studio/view.h // Purpose: View-related classes // Author: Julian Smart // Modified by: @@ -13,7 +13,7 @@ #define _STUDIO_VIEW_H_ #include "doc.h" -#include +#include "wx/ogl/ogl.h" class csDiagramView; class csCanvas: public wxShapeCanvas diff --git a/contrib/samples/stc/edit.cpp b/contrib/samples/stc/edit.cpp index 7a166bbcdd..a921882b5d 100644 --- a/contrib/samples/stc/edit.cpp +++ b/contrib/samples/stc/edit.cpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////// -// File: edit.cpp +// File: contrib/samples/stc/edit.cpp // Purpose: STC test module // Maintainer: Wyo // Created: 2003-09-01 @@ -17,7 +17,7 @@ // headers //---------------------------------------------------------------------------- -// For compilers that support precompilation, includes . +// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ diff --git a/contrib/samples/stc/prefs.cpp b/contrib/samples/stc/prefs.cpp index 2e86866940..5698a879f6 100644 --- a/contrib/samples/stc/prefs.cpp +++ b/contrib/samples/stc/prefs.cpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////// -// File: prefs.cpp +// File: contrib/samples/stc/prefs.cpp // Purpose: STC test Preferences initialization // Maintainer: Wyo // Created: 2003-09-01 @@ -12,7 +12,7 @@ // headers //---------------------------------------------------------------------------- -// For compilers that support precompilation, includes . +// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ diff --git a/contrib/samples/stc/stctest.cpp b/contrib/samples/stc/stctest.cpp index 35b8a01121..6275c242b7 100644 --- a/contrib/samples/stc/stctest.cpp +++ b/contrib/samples/stc/stctest.cpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////// -// File: stctest.cpp +// File: contrib/samples/stc/stctest.cpp // Purpose: STC test application // Maintainer: Otto Wyss // Created: 2003-09-01 @@ -12,7 +12,7 @@ // headers //---------------------------------------------------------------------------- -// For compilers that support precompilation, includes . +// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp index 7a166bbcdd..a921882b5d 100644 --- a/samples/stc/edit.cpp +++ b/samples/stc/edit.cpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////// -// File: edit.cpp +// File: contrib/samples/stc/edit.cpp // Purpose: STC test module // Maintainer: Wyo // Created: 2003-09-01 @@ -17,7 +17,7 @@ // headers //---------------------------------------------------------------------------- -// For compilers that support precompilation, includes . +// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ diff --git a/samples/stc/prefs.cpp b/samples/stc/prefs.cpp index 2e86866940..5698a879f6 100644 --- a/samples/stc/prefs.cpp +++ b/samples/stc/prefs.cpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////// -// File: prefs.cpp +// File: contrib/samples/stc/prefs.cpp // Purpose: STC test Preferences initialization // Maintainer: Wyo // Created: 2003-09-01 @@ -12,7 +12,7 @@ // headers //---------------------------------------------------------------------------- -// For compilers that support precompilation, includes . +// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index 35b8a01121..6275c242b7 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -1,5 +1,5 @@ ////////////////////////////////////////////////////////////////////////////// -// File: stctest.cpp +// File: contrib/samples/stc/stctest.cpp // Purpose: STC test application // Maintainer: Otto Wyss // Created: 2003-09-01 @@ -12,7 +12,7 @@ // headers //---------------------------------------------------------------------------- -// For compilers that support precompilation, includes . +// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -- 2.45.2