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
This commit is contained in:
@@ -9,17 +9,17 @@
|
|||||||
// Include wxWindows' headers
|
// Include wxWindows' headers
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/image.h>
|
#include "wx/image.h"
|
||||||
#include <wx/statline.h>
|
#include "wx/statline.h"
|
||||||
#include <wx/spinbutt.h>
|
#include "wx/spinbutt.h"
|
||||||
#include <wx/spinctrl.h>
|
#include "wx/spinctrl.h"
|
||||||
#include <wx/splitter.h>
|
#include "wx/splitter.h"
|
||||||
#include <wx/listctrl.h>
|
#include "wx/listctrl.h"
|
||||||
#include <wx/treectrl.h>
|
#include "wx/treectrl.h"
|
||||||
#include <wx/notebook.h>
|
#include "wx/notebook.h"
|
||||||
|
|
||||||
// Declare window functions
|
// Declare window functions
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
#define ID_TEXTCTRL_MDL 20
|
#define ID_TEXTCTRL_MDL 20
|
||||||
#define ID_LISTBOX_MFTR 11
|
#define ID_LISTBOX_MFTR 11
|
||||||
#define ID_LISTBOX_MDL 21
|
#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
|
// Declare bitmap functions
|
||||||
|
|
||||||
|
@@ -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
|
// Purpose: Test custom scrollbar handling of wxDynamicSashWindow by
|
||||||
// creating a dynamic sash window where the client scrolls a
|
// creating a dynamic sash window where the client scrolls a
|
||||||
// a subwindow of the client window by responding to scroll
|
// a subwindow of the client window by responding to scroll
|
||||||
@@ -25,13 +25,13 @@
|
|||||||
#include "wx/wx.h"
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/app.h>
|
#include "wx/app.h"
|
||||||
#include <wx/frame.h>
|
#include "wx/frame.h"
|
||||||
#include <wx/choice.h>
|
#include "wx/choice.h"
|
||||||
#include <wx/dcclient.h>
|
#include "wx/dcclient.h"
|
||||||
#include <wx/gizmos/dynamicsash.h>
|
#include "wx/gizmos/dynamicsash.h"
|
||||||
#include <wx/layout.h>
|
#include "wx/layout.h"
|
||||||
#include <wx/scrolbar.h>
|
#include "wx/scrolbar.h"
|
||||||
|
|
||||||
class SwitchDemo : public wxApp {
|
class SwitchDemo : public wxApp {
|
||||||
public:
|
public:
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: doc.cpp
|
// Name: contrib/samples/ogl/ogledit/doc.cpp
|
||||||
// Purpose: Implements document functionality in OGLEdit
|
// Purpose: Implements document functionality in OGLEdit
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/ioswrap.h>
|
#include "wx/ioswrap.h"
|
||||||
|
|
||||||
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
||||||
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
|
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: doc.h
|
// Name: contrib/samples/ogl/ogledit/doc.h
|
||||||
// Purpose: Document classes
|
// Purpose: Document classes
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -12,17 +12,17 @@
|
|||||||
#ifndef _OGLSAMPLE_DOC_H_
|
#ifndef _OGLSAMPLE_DOC_H_
|
||||||
#define _OGLSAMPLE_DOC_H_
|
#define _OGLSAMPLE_DOC_H_
|
||||||
|
|
||||||
#include <wx/docview.h>
|
#include "wx/docview.h"
|
||||||
#include <wx/cmdproc.h>
|
#include "wx/cmdproc.h"
|
||||||
#include <wx/string.h>
|
#include "wx/string.h"
|
||||||
|
|
||||||
#include <wx/ogl/ogl.h> // 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
|
#if wxUSE_PROLOGIO
|
||||||
#include <wx/deprecated/wxexpr.h>
|
#include "wx/deprecated/wxexpr.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/ogl/ogl.h>
|
#include "wx/ogl/ogl.h"
|
||||||
|
|
||||||
#if wxUSE_STD_IOSTREAM
|
#if wxUSE_STD_IOSTREAM
|
||||||
#include <iosfwd>
|
#include <iosfwd>
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: ogledit.cpp
|
// Name: contrib/samples/ogl/ogledit/ogledit.cpp
|
||||||
// Purpose: OGLEdit sample app
|
// Purpose: OGLEdit sample app
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: ogledit.h
|
// Name: contrib/samples/ogl/ogledit/ogledit.h
|
||||||
// Purpose: OGL sample
|
// Purpose: OGL sample
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -12,8 +12,8 @@
|
|||||||
#ifndef _OGLSAMPLE_OGLEDIT_H_
|
#ifndef _OGLSAMPLE_OGLEDIT_H_
|
||||||
#define _OGLSAMPLE_OGLEDIT_H_
|
#define _OGLSAMPLE_OGLEDIT_H_
|
||||||
|
|
||||||
#include <wx/docview.h>
|
#include "wx/docview.h"
|
||||||
#include <wx/ogl/ogl.h> // 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
|
||||||
|
|
||||||
// Define a new application
|
// Define a new application
|
||||||
class MyFrame;
|
class MyFrame;
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: palette.cpp
|
// Name: samples/ogl/ogledit/palette.cpp
|
||||||
// Purpose: OGLEdit palette
|
// Purpose: OGLEdit palette
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/toolbar.h>
|
#include "wx/toolbar.h"
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -101,4 +101,3 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
|
|||||||
palette->currentlySelected = PALETTE_ARROW;
|
palette->currentlySelected = PALETTE_ARROW;
|
||||||
return palette;
|
return palette;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: palette.h
|
// Name: contrib/samples/ogl/ogledit/palette.h
|
||||||
// Purpose: OGL sample palette
|
// Purpose: OGL sample palette
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -12,10 +12,10 @@
|
|||||||
#ifndef _OGLSAMPLE_PALETTE_H_
|
#ifndef _OGLSAMPLE_PALETTE_H_
|
||||||
#define _OGLSAMPLE_PALETTE_H_
|
#define _OGLSAMPLE_PALETTE_H_
|
||||||
|
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#include <wx/string.h>
|
#include "wx/string.h"
|
||||||
#include <wx/deprecated/setup.h>
|
#include "wx/deprecated/setup.h"
|
||||||
#include <wx/deprecated/tbarsmpl.h>
|
#include "wx/deprecated/tbarsmpl.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Object editor tool palette
|
* Object editor tool palette
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: view.cpp
|
// Name: contrib/samples/ogl/ogledit/view.cpp
|
||||||
// Purpose: Implements view functionality in OGLEdit
|
// Purpose: Implements view functionality in OGLEdit
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/colordlg.h>
|
#include "wx/colordlg.h"
|
||||||
|
|
||||||
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
||||||
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
|
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: view.h
|
// Name: contrib/samples/ogl/ogledit/view.h
|
||||||
// Purpose: View-related classes
|
// Purpose: View-related classes
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
#define _OGLSAMPLE_VIEW_H_
|
#define _OGLSAMPLE_VIEW_H_
|
||||||
|
|
||||||
#include "doc.h"
|
#include "doc.h"
|
||||||
#include <wx/ogl/ogl.h>
|
#include "wx/ogl/ogl.h"
|
||||||
|
|
||||||
class MyCanvas: public wxShapeCanvas
|
class MyCanvas: public wxShapeCanvas
|
||||||
{
|
{
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: cspalette.cpp
|
// Name: contrib/samples/ogl/studio/cspalette.cpp
|
||||||
// Purpose: OGLEdit palette
|
// Purpose: OGLEdit palette
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/laywin.h>
|
#include "wx/laywin.h"
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: cspalette.h
|
// Name: contrib/samples/ogl/studio/cspalette.h
|
||||||
// Purpose: OGL sample palette
|
// Purpose: OGL sample palette
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -12,9 +12,9 @@
|
|||||||
#ifndef _STUDIO_CSPALETTE_H_
|
#ifndef _STUDIO_CSPALETTE_H_
|
||||||
#define _STUDIO_CSPALETTE_H_
|
#define _STUDIO_CSPALETTE_H_
|
||||||
|
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#include <wx/string.h>
|
#include "wx/string.h"
|
||||||
#include <wx/ogl/ogl.h> // 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
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Object editor tool palette
|
* Object editor tool palette
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: csprint.cpp
|
// Name: contrib/samples/ogl/studio/csprint.cpp
|
||||||
// Purpose: Printing and clipboard functionality
|
// Purpose: Printing and clipboard functionality
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -17,15 +17,15 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/ogl/ogl.h> // 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 <wx/clipbrd.h>
|
#include "wx/clipbrd.h"
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
#include <wx/metafile.h>
|
#include "wx/metafile.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "studio.h"
|
#include "studio.h"
|
||||||
@@ -318,5 +318,3 @@ bool csDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxD
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: dialogs.cpp
|
// Name: contrib/samples/ogl/studio/dialogs.cpp
|
||||||
// Purpose: Implements Studio dialogs
|
// Purpose: Implements Studio dialogs
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 12/07/98
|
// Created: 12/07/98
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence:
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx.h".
|
// For compilers that support precompilation, includes "wx.h".
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "dialogs.h"
|
#include "dialogs.h"
|
||||||
@@ -530,5 +530,3 @@ END_EVENT_TABLE()
|
|||||||
csTextBoxDialog::csTextBoxDialog()
|
csTextBoxDialog::csTextBoxDialog()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1,21 +1,21 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: dialogs.h
|
// Name: contrib/samples/ogl/studio/dialogs.h
|
||||||
// Purpose: Miscellaneous dialogs
|
// Purpose: Miscellaneous dialogs
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 12/07/98
|
// Created: 12/07/98
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence:
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef _STUDIO_DIALOGS_H_
|
#ifndef _STUDIO_DIALOGS_H_
|
||||||
#define _STUDIO_DIALOGS_H_
|
#define _STUDIO_DIALOGS_H_
|
||||||
|
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#include <wx/notebook.h>
|
#include "wx/notebook.h"
|
||||||
|
|
||||||
#include <wx/ogl/ogl.h> // 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
|
#if wxUSE_WX_RESOURCES
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: doc.cpp
|
// Name: contrib/samples/ogl/studio/doc.cpp
|
||||||
// Purpose: Implements document functionality
|
// Purpose: Implements document functionality
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -17,13 +17,13 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "studio.h"
|
#include "studio.h"
|
||||||
#include "doc.h"
|
#include "doc.h"
|
||||||
#include "view.h"
|
#include "view.h"
|
||||||
#include <wx/ogl/basicp.h>
|
#include "wx/ogl/basicp.h"
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(csDiagramDocument, wxDocument)
|
IMPLEMENT_DYNAMIC_CLASS(csDiagramDocument, wxDocument)
|
||||||
|
|
||||||
@@ -591,4 +591,3 @@ bool csCommandState::Undo()
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: doc.h
|
// Name: contrib/samples/ogl/studio/doc.h
|
||||||
// Purpose: Document classes
|
// Purpose: Document classes
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -12,11 +12,11 @@
|
|||||||
#ifndef _STUDIO_DOC_H_
|
#ifndef _STUDIO_DOC_H_
|
||||||
#define _STUDIO_DOC_H_
|
#define _STUDIO_DOC_H_
|
||||||
|
|
||||||
#include <wx/docview.h>
|
#include "wx/docview.h"
|
||||||
#include <wx/cmdproc.h>
|
#include "wx/cmdproc.h"
|
||||||
#include <wx/string.h>
|
#include "wx/string.h"
|
||||||
|
|
||||||
#include <wx/ogl/ogl.h> // 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"
|
#include "shapes.h"
|
||||||
|
|
||||||
|
@@ -1,18 +1,18 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: mainfrm.h
|
// Name: contrib/samples/ogl/studio/mainfrm.h
|
||||||
// Purpose: Studio main window class
|
// Purpose: Studio main window class
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 27/7/98
|
// Created: 27/7/98
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence:
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef _STUDIO_MAINFRM_H_
|
#ifndef _STUDIO_MAINFRM_H_
|
||||||
#define _STUDIO_MAINFRM_H_
|
#define _STUDIO_MAINFRM_H_
|
||||||
|
|
||||||
#include <wx/docmdi.h>
|
#include "wx/docmdi.h"
|
||||||
|
|
||||||
class wxSashLayoutWindow;
|
class wxSashLayoutWindow;
|
||||||
class wxSashEvent;
|
class wxSashEvent;
|
||||||
@@ -52,4 +52,3 @@ DECLARE_EVENT_TABLE()
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
// _STUDIO_MAINFRM_H_
|
// _STUDIO_MAINFRM_H_
|
||||||
|
|
||||||
|
@@ -1,19 +1,19 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: project.h
|
// Name: contrib/samples/ogl/studio/project.h
|
||||||
// Purpose: Studio project classes
|
// Purpose: Studio project classes
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 27/7/98
|
// Created: 27/7/98
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence:
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef _STUDIO_PROJECT_H_
|
#ifndef _STUDIO_PROJECT_H_
|
||||||
#define _STUDIO_PROJECT_H_
|
#define _STUDIO_PROJECT_H_
|
||||||
|
|
||||||
#include <wx/treectrl.h>
|
#include "wx/treectrl.h"
|
||||||
#include <wx/imaglist.h>
|
#include "wx/imaglist.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is the project tree control.
|
* This is the project tree control.
|
||||||
@@ -39,4 +39,3 @@ DECLARE_EVENT_TABLE()
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
// _STUDIO_PROJECT_H_
|
// _STUDIO_PROJECT_H_
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: shapes.cpp
|
// Name: contrib/samples/ogl/studio/shapes.cpp
|
||||||
// Purpose: Implements Studio shapes
|
// Purpose: Implements Studio shapes
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -17,14 +17,14 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
||||||
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
|
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/ogl/ogl.h> // 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 "studio.h"
|
||||||
#include "doc.h"
|
#include "doc.h"
|
||||||
@@ -1195,4 +1195,3 @@ void ShapeEditMenu::OnCommand(wxCommandEvent& event)
|
|||||||
{
|
{
|
||||||
studioShapeEditProc(*this, event);
|
studioShapeEditProc(*this, event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,23 +1,23 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: shapes.h
|
// Name: contrib/samples/ogl/studio/shapes.h
|
||||||
// Purpose: Shape classes
|
// Purpose: Shape classes
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 12/07/98
|
// Created: 12/07/98
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence:
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef _STUDIO_SHAPES_H_
|
#ifndef _STUDIO_SHAPES_H_
|
||||||
#define _STUDIO_SHAPES_H_
|
#define _STUDIO_SHAPES_H_
|
||||||
|
|
||||||
#include <wx/docview.h>
|
#include "wx/docview.h"
|
||||||
#include <wx/string.h>
|
#include "wx/string.h"
|
||||||
#include <wx/ogl/ogl.h> // 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 <wx/ogl/basicp.h>
|
#include "wx/ogl/basicp.h"
|
||||||
#include <wx/ogl/linesp.h>
|
#include "wx/ogl/linesp.h"
|
||||||
#include <wx/ogl/drawn.h>
|
#include "wx/ogl/drawn.h"
|
||||||
|
|
||||||
class csDiagramDocument;
|
class csDiagramDocument;
|
||||||
|
|
||||||
|
@@ -1,29 +1,29 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: Studio.h
|
// Name: contrib/samples/ogl/studio/studio.h
|
||||||
// Purpose: Studio application class
|
// Purpose: Studio application class
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 27/7/98
|
// Created: 27/7/98
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence:
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef _STUDIO_STUDIO_H_
|
#ifndef _STUDIO_STUDIO_H_
|
||||||
#define _STUDIO_STUDIO_H_
|
#define _STUDIO_STUDIO_H_
|
||||||
|
|
||||||
#include <wx/docmdi.h>
|
#include "wx/docmdi.h"
|
||||||
#include <wx/help.h>
|
#include "wx/help.h"
|
||||||
#include <wx/cshelp.h>
|
#include "wx/cshelp.h"
|
||||||
#include <wx/helphtml.h>
|
#include "wx/helphtml.h"
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
#include <wx/msw/helpchm.h>
|
#include "wx/msw/helpchm.h"
|
||||||
#else
|
#else
|
||||||
#include <wx/html/helpctrl.h>
|
#include "wx/html/helpctrl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/ogl/ogl.h>
|
#include "wx/ogl/ogl.h"
|
||||||
#include <wx/ogl/canvas.h>
|
#include "wx/ogl/canvas.h"
|
||||||
#include "shapes.h"
|
#include "shapes.h"
|
||||||
|
|
||||||
class csEditorToolPalette;
|
class csEditorToolPalette;
|
||||||
@@ -175,4 +175,3 @@ DECLARE_APP(csApp)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
// _STUDIO_STUDIO_H_
|
// _STUDIO_STUDIO_H_
|
||||||
|
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: symbols.cpp
|
// Name: contrib/samples/ogl/studio/symbols.cpp
|
||||||
// Purpose: Implements the Studio symbol database
|
// Purpose: Implements the Studio symbol database
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 12/07/98
|
// Created: 12/07/98
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence:
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx.h".
|
// For compilers that support precompilation, includes "wx.h".
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/ogl/ogl.h> // 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 "studio.h"
|
||||||
#include "doc.h"
|
#include "doc.h"
|
||||||
@@ -215,4 +215,3 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too
|
|||||||
|
|
||||||
return newBitmap;
|
return newBitmap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,21 +1,21 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: symbols.h
|
// Name: contrib/samples/ogl/studio/symbols.h
|
||||||
// Purpose: Symbol classes (symbol database)
|
// Purpose: Symbol classes (symbol database)
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 12/07/98
|
// Created: 12/07/98
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence:
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef _STUDIO_SYMBOLS_H_
|
#ifndef _STUDIO_SYMBOLS_H_
|
||||||
#define _STUDIO_SYMBOLS_H_
|
#define _STUDIO_SYMBOLS_H_
|
||||||
|
|
||||||
#include <wx/docview.h>
|
#include "wx/docview.h"
|
||||||
#include <wx/string.h>
|
#include "wx/string.h"
|
||||||
|
|
||||||
#include <wx/ogl/ogl.h> // 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
|
* csSymbol
|
||||||
|
@@ -1,12 +1,12 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: view.cpp
|
// Name: contrib/samples/ogl/studio/view.cpp
|
||||||
// Purpose: Implements view functionality
|
// Purpose: Implements view functionality
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: 12/07/98
|
// Created: 12/07/98
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Julian Smart
|
// Copyright: (c) Julian Smart
|
||||||
// Licence:
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx.h".
|
// For compilers that support precompilation, includes "wx.h".
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include <wx/wx.h>
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/colordlg.h>
|
#include "wx/colordlg.h"
|
||||||
|
|
||||||
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
#if !wxUSE_DOC_VIEW_ARCHITECTURE
|
||||||
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
|
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
#include "cspalette.h"
|
#include "cspalette.h"
|
||||||
#include "symbols.h"
|
#include "symbols.h"
|
||||||
#include "dialogs.h"
|
#include "dialogs.h"
|
||||||
#include <wx/ogl/basicp.h>
|
#include "wx/ogl/basicp.h"
|
||||||
#include <wx/ogl/linesp.h>
|
#include "wx/ogl/linesp.h"
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(csDiagramView, wxView)
|
IMPLEMENT_DYNAMIC_CLASS(csDiagramView, wxView)
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: view.h
|
// Name: contrib/samples/ogl/studio/view.h
|
||||||
// Purpose: View-related classes
|
// Purpose: View-related classes
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
#define _STUDIO_VIEW_H_
|
#define _STUDIO_VIEW_H_
|
||||||
|
|
||||||
#include "doc.h"
|
#include "doc.h"
|
||||||
#include <wx/ogl/ogl.h>
|
#include "wx/ogl/ogl.h"
|
||||||
|
|
||||||
class csDiagramView;
|
class csDiagramView;
|
||||||
class csCanvas: public wxShapeCanvas
|
class csCanvas: public wxShapeCanvas
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
// File: edit.cpp
|
// File: contrib/samples/stc/edit.cpp
|
||||||
// Purpose: STC test module
|
// Purpose: STC test module
|
||||||
// Maintainer: Wyo
|
// Maintainer: Wyo
|
||||||
// Created: 2003-09-01
|
// Created: 2003-09-01
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
// headers
|
// headers
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
// For compilers that support precompilation, includes <wx/wx.h>.
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
// File: prefs.cpp
|
// File: contrib/samples/stc/prefs.cpp
|
||||||
// Purpose: STC test Preferences initialization
|
// Purpose: STC test Preferences initialization
|
||||||
// Maintainer: Wyo
|
// Maintainer: Wyo
|
||||||
// Created: 2003-09-01
|
// Created: 2003-09-01
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
// headers
|
// headers
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
// For compilers that support precompilation, includes <wx/wx.h>.
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
// File: stctest.cpp
|
// File: contrib/samples/stc/stctest.cpp
|
||||||
// Purpose: STC test application
|
// Purpose: STC test application
|
||||||
// Maintainer: Otto Wyss
|
// Maintainer: Otto Wyss
|
||||||
// Created: 2003-09-01
|
// Created: 2003-09-01
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
// headers
|
// headers
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
// For compilers that support precompilation, includes <wx/wx.h>.
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
// File: edit.cpp
|
// File: contrib/samples/stc/edit.cpp
|
||||||
// Purpose: STC test module
|
// Purpose: STC test module
|
||||||
// Maintainer: Wyo
|
// Maintainer: Wyo
|
||||||
// Created: 2003-09-01
|
// Created: 2003-09-01
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
// headers
|
// headers
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
// For compilers that support precompilation, includes <wx/wx.h>.
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
// File: prefs.cpp
|
// File: contrib/samples/stc/prefs.cpp
|
||||||
// Purpose: STC test Preferences initialization
|
// Purpose: STC test Preferences initialization
|
||||||
// Maintainer: Wyo
|
// Maintainer: Wyo
|
||||||
// Created: 2003-09-01
|
// Created: 2003-09-01
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
// headers
|
// headers
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
// For compilers that support precompilation, includes <wx/wx.h>.
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
// File: stctest.cpp
|
// File: contrib/samples/stc/stctest.cpp
|
||||||
// Purpose: STC test application
|
// Purpose: STC test application
|
||||||
// Maintainer: Otto Wyss
|
// Maintainer: Otto Wyss
|
||||||
// Created: 2003-09-01
|
// Created: 2003-09-01
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
// headers
|
// headers
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
// For compilers that support precompilation, includes <wx/wx.h>.
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
|
Reference in New Issue
Block a user