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
2006-02-10 11:59:52 +00:00
parent e77138c0e2
commit f4ec6bd20a
32 changed files with 131 additions and 142 deletions
--- 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 <wx/wx.h>
+#include "wx/wx.h"
 #endif

-#include <wx/laywin.h>
+#include "wx/laywin.h"

 #include <ctype.h>
 #include <stdlib.h>
--- 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 <wx/wx.h>
-#include <wx/string.h>
-#include <wx/ogl/ogl.h> // 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
--- 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 <wx/wx.h>
+#include "wx/wx.h"
 #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__
-#include <wx/metafile.h>
+#include "wx/metafile.h"
 #endif

 #include "studio.h"
@@ -318,5 +318,3 @@ bool csDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxD

    return true;
 }
-
-
--- 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 <wx/wx.h>
+#include "wx/wx.h"
 #endif

 #include "dialogs.h"
@@ -530,5 +530,3 @@ END_EVENT_TABLE()
 csTextBoxDialog::csTextBoxDialog()
 {
 }
-
-
--- 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 <wx/wx.h>
-#include <wx/notebook.h>
+#include "wx/wx.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

--- 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 <wx/wx.h>
+#include "wx/wx.h"
 #endif

 #include "studio.h"
 #include "doc.h"
 #include "view.h"
-#include <wx/ogl/basicp.h>
+#include "wx/ogl/basicp.h"

 IMPLEMENT_DYNAMIC_CLASS(csDiagramDocument, wxDocument)

@@ -591,4 +591,3 @@ bool csCommandState::Undo()

    return true;
 }
-
--- 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 <wx/docview.h>
-#include <wx/cmdproc.h>
-#include <wx/string.h>
+#include "wx/docview.h"
+#include "wx/cmdproc.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"

--- 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 <wx/docmdi.h>
+#include "wx/docmdi.h"

 class wxSashLayoutWindow;
 class wxSashEvent;
@@ -52,4 +52,3 @@ DECLARE_EVENT_TABLE()

 #endif
  // _STUDIO_MAINFRM_H_
-
--- 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 <wx/treectrl.h>
-#include <wx/imaglist.h>
+#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_
-
--- 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 <wx/wx.h>
+#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 <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 "doc.h"
@@ -1195,4 +1195,3 @@ void ShapeEditMenu::OnCommand(wxCommandEvent& event)
 {
    studioShapeEditProc(*this, event);
 }
-
--- 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 <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>
+#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;

--- 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 <wx/docmdi.h>
-#include <wx/help.h>
-#include <wx/cshelp.h>
-#include <wx/helphtml.h>
+#include "wx/docmdi.h"
+#include "wx/help.h"
+#include "wx/cshelp.h"
+#include "wx/helphtml.h"
 #ifdef __WXMSW__
-    #include <wx/msw/helpchm.h>
+    #include "wx/msw/helpchm.h"
 #else
-    #include <wx/html/helpctrl.h>
+    #include "wx/html/helpctrl.h"
 #endif

-#include <wx/ogl/ogl.h>
-#include <wx/ogl/canvas.h>
+#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_
-
--- 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 <wx/wx.h>
+#include "wx/wx.h"
 #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 "doc.h"
@@ -215,4 +215,3 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too

    return newBitmap;
 }
-
--- 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 <wx/docview.h>
-#include <wx/string.h>
+#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/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h

 /*
 * csSymbol
--- 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 <wx/wx.h>
+#include "wx/wx.h"
 #endif

-#include <wx/colordlg.h>
+#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 <wx/ogl/basicp.h>
-#include <wx/ogl/linesp.h>
+#include "wx/ogl/basicp.h"
+#include "wx/ogl/linesp.h"

 IMPLEMENT_DYNAMIC_CLASS(csDiagramView, wxView)

--- 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 <wx/ogl/ogl.h>
+#include "wx/ogl/ogl.h"

 class csDiagramView;
 class csCanvas: public wxShapeCanvas