From cecdcad1db85bec15c83bc80543742fb32dacb27 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 31 Mar 2005 19:18:25 +0000 Subject: [PATCH] OGL samples again buildable after deprecated/setup.h turned off by default. Minor cleaning where applicable. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/ogl/ogledit/doc.cpp | 6 +-- contrib/samples/ogl/ogledit/doc.h | 18 +++---- contrib/samples/ogl/ogledit/ogledit.cpp | 8 +-- contrib/samples/ogl/ogledit/ogledit.h | 65 +++++++++++++------------ contrib/samples/ogl/ogledit/view.cpp | 4 +- contrib/samples/ogl/studio/cspalette.h | 8 +-- contrib/samples/ogl/studio/csprint.cpp | 7 ++- contrib/samples/ogl/studio/dialogs.cpp | 14 +++--- contrib/samples/ogl/studio/dialogs.h | 9 +++- contrib/samples/ogl/studio/doc.cpp | 10 ++-- contrib/samples/ogl/studio/doc.h | 14 +++--- contrib/samples/ogl/studio/mainfrm.cpp | 2 + contrib/samples/ogl/studio/shapes.cpp | 15 ++++-- contrib/samples/ogl/studio/shapes.h | 11 ++--- contrib/samples/ogl/studio/studio.cpp | 8 +-- contrib/samples/ogl/studio/symbols.cpp | 5 +- contrib/samples/ogl/studio/symbols.h | 5 +- contrib/samples/ogl/studio/view.cpp | 6 ++- 18 files changed, 113 insertions(+), 102 deletions(-) diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp index 97fb2b5a9f..833ab5c12a 100644 --- a/contrib/samples/ogl/ogledit/doc.cpp +++ b/contrib/samples/ogl/ogledit/doc.cpp @@ -194,7 +194,7 @@ bool DiagramCommand::Do(void) { switch (cmd) { - case OGLEDIT_CUT: + case wxID_CUT: { if (shape) { @@ -340,7 +340,7 @@ bool DiagramCommand::Undo(void) { switch (cmd) { - case OGLEDIT_CUT: + case wxID_CUT: { if (shape) { @@ -428,7 +428,7 @@ void DiagramCommand::RemoveLines(wxShape *shape) while (node) { wxLineShape *line = (wxLineShape *)node->GetData(); - doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), OGLEDIT_CUT, doc, NULL, 0.0, 0.0, line->Selected(), line)); + doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), wxID_CUT, doc, NULL, 0.0, 0.0, line->Selected(), line)); node = shape->GetLines().GetFirst(); } diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h index 0316e56671..bcadc567ca 100644 --- a/contrib/samples/ogl/ogledit/doc.h +++ b/contrib/samples/ogl/ogledit/doc.h @@ -20,7 +20,7 @@ #include #include -#include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h #if wxUSE_PROLOGIO #include @@ -35,7 +35,7 @@ /* * Override a few members for this application */ - + class MyDiagram: public wxDiagram { public: @@ -50,7 +50,7 @@ class MyDiagram: public wxDiagram * A few new shape classes so we have a 1:1 mapping * between palette symbol and unique class */ - + class wxRoundedRectangleShape: public wxRectangleShape { DECLARE_DYNAMIC_CLASS(wxRoundedRectangleShape) @@ -71,7 +71,7 @@ class wxDiamondShape: public wxPolygonShape * All shape event behaviour is routed through this handler, so we don't * have to derive from each shape class. We plug this in to each shape. */ - + class MyEvtHandler: public wxShapeEvtHandler { public: @@ -93,14 +93,14 @@ class MyEvtHandler: public wxShapeEvtHandler /* * A diagram document, which contains a diagram. */ - + class DiagramDocument: public wxDocument { DECLARE_DYNAMIC_CLASS(DiagramDocument) private: public: MyDiagram diagram; - + DiagramDocument(void); ~DiagramDocument(void); @@ -111,9 +111,9 @@ class DiagramDocument: public wxDocument virtual wxOutputStream& SaveObject(wxOutputStream& stream); virtual wxInputStream& LoadObject(wxInputStream& stream); #endif - + inline wxDiagram *GetDiagram() { return &diagram; } - + bool OnCloseDocument(void); }; @@ -142,7 +142,7 @@ class DiagramDocument: public wxDocument * Assume, as here, that we keep a pointer to the old shape so we reuse it * when we recreate. */ - + class DiagramCommand: public wxCommand { protected: diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp index c0c668408f..aeaaf1af96 100644 --- a/contrib/samples/ogl/ogledit/ogledit.cpp +++ b/contrib/samples/ogl/ogledit/ogledit.cpp @@ -52,7 +52,7 @@ MyApp::MyApp(void) bool MyApp::OnInit(void) { wxOGLInitialize(); - + //// Create a document manager myDocManager = new wxDocManager; @@ -88,13 +88,13 @@ bool MyApp::OnInit(void) edit_menu->Append(wxID_UNDO, _T("&Undo")); edit_menu->Append(wxID_REDO, _T("&Redo")); edit_menu->AppendSeparator(); - edit_menu->Append(OGLEDIT_CUT, _T("&Cut")); + edit_menu->Append(wxID_CUT, _T("&Cut")); edit_menu->AppendSeparator(); edit_menu->Append(OGLEDIT_CHANGE_BACKGROUND_COLOUR, _T("Change &background colour")); edit_menu->Append(OGLEDIT_EDIT_LABEL, _T("Edit &label")); frame->editMenu = edit_menu; - + file_menu->AppendSeparator(); file_menu->Append(wxID_EXIT, _T("E&xit")); @@ -170,7 +170,7 @@ void MyFrame::OnSize(wxSizeEvent& event) int canvasY = 0; int canvasW = cw - paletteW; int canvasH = ch; - + palette->SetSize(paletteX, paletteY, paletteW, paletteH); canvas->SetSize(canvasX, canvasY, canvasW, canvasH); } diff --git a/contrib/samples/ogl/ogledit/ogledit.h b/contrib/samples/ogl/ogledit/ogledit.h index 54847c4701..6ecddb60bb 100644 --- a/contrib/samples/ogl/ogledit/ogledit.h +++ b/contrib/samples/ogl/ogledit/ogledit.h @@ -17,23 +17,23 @@ #define _OGLSAMPLE_OGLEDIT_H_ #include -#include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h // Define a new application class MyFrame; class EditorToolPalette; class MyApp: public wxApp { - public: - MyFrame *frame; - wxDocManager* myDocManager; + public: + MyFrame *frame; + wxDocManager* myDocManager; - MyApp(void); - bool OnInit(void); - int OnExit(void); + MyApp(void); + bool OnInit(void); + int OnExit(void); - // Palette stuff - EditorToolPalette *CreatePalette(wxFrame *parent); + // Palette stuff + EditorToolPalette *CreatePalette(wxFrame *parent); }; DECLARE_APP(MyApp) @@ -42,22 +42,22 @@ DECLARE_APP(MyApp) class MyCanvas; class MyFrame: public wxDocParentFrame { - DECLARE_CLASS(MyFrame) - public: - wxMenu *editMenu; - - MyCanvas *canvas; - EditorToolPalette *palette; - - MyFrame(wxDocManager *manager, wxFrame *parent, const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE); - - MyCanvas *CreateCanvas(wxView *view, wxFrame *parent); - void OnSize(wxSizeEvent& event); - void OnCloseWindow(wxCloseEvent& event); - void OnAbout(wxCommandEvent& event); + DECLARE_CLASS(MyFrame) +public: + wxMenu *editMenu; + + MyCanvas *canvas; + EditorToolPalette *palette; + + MyFrame(wxDocManager *manager, wxFrame *parent, const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE); + + MyCanvas *CreateCanvas(wxView *view, wxFrame *parent); + void OnSize(wxSizeEvent& event); + void OnCloseWindow(wxCloseEvent& event); + void OnAbout(wxCommandEvent& event); DECLARE_EVENT_TABLE() }; @@ -66,13 +66,14 @@ extern MyFrame *GetMainFrame(void); // Menu/undo/redo commands -#define OGLEDIT_CUT 1 -#define OGLEDIT_ADD_SHAPE 2 -#define OGLEDIT_ADD_LINE 3 -#define OGLEDIT_EDIT_LABEL 4 -#define OGLEDIT_CHANGE_BACKGROUND_COLOUR 5 - -#define OGLEDIT_ABOUT 100 +enum +{ + OGLEDIT_ADD_SHAPE = wxID_HIGHEST, + OGLEDIT_ADD_LINE, + OGLEDIT_EDIT_LABEL, + OGLEDIT_CHANGE_BACKGROUND_COLOUR, + OGLEDIT_ABOUT = wxID_ABOUT +}; #endif // _OGLSAMPLE_OGLEDIT_H_ diff --git a/contrib/samples/ogl/ogledit/view.cpp b/contrib/samples/ogl/ogledit/view.cpp index 1942b2c820..a23020a93d 100644 --- a/contrib/samples/ogl/ogledit/view.cpp +++ b/contrib/samples/ogl/ogledit/view.cpp @@ -38,7 +38,7 @@ IMPLEMENT_DYNAMIC_CLASS(DiagramView, wxView) BEGIN_EVENT_TABLE(DiagramView, wxView) - EVT_MENU(OGLEDIT_CUT, DiagramView::OnCut) + EVT_MENU(wxID_CUT, DiagramView::OnCut) EVT_MENU(OGLEDIT_CHANGE_BACKGROUND_COLOUR, DiagramView::OnChangeBackgroundColour) EVT_MENU(OGLEDIT_EDIT_LABEL, DiagramView::OnEditLabel) END_EVENT_TABLE() @@ -195,7 +195,7 @@ void DiagramView::OnCut(wxCommandEvent& WXUNUSED(event)) wxShape *theShape = FindSelectedShape(); if (theShape) - doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), OGLEDIT_CUT, doc, NULL, 0.0, 0.0, true, theShape)); + doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), wxID_CUT, doc, NULL, 0.0, 0.0, true, theShape)); } void DiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event)) diff --git a/contrib/samples/ogl/studio/cspalette.h b/contrib/samples/ogl/studio/cspalette.h index 8583f85d5a..f4373b75cc 100644 --- a/contrib/samples/ogl/studio/cspalette.h +++ b/contrib/samples/ogl/studio/cspalette.h @@ -18,19 +18,13 @@ #include #include -#include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h /* * Object editor tool palette * */ -// TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position! -// Needs to have a parent window... -// So use a simple toolbar at present. -// ABX: Simple toolbar is not available in default compilation and is deprecated -// so I use wxToolBar anyway -// #define TOOLPALETTECLASS wxToolBarSimple #define TOOLPALETTECLASS wxToolBar class csEditorToolPalette: public TOOLPALETTECLASS diff --git a/contrib/samples/ogl/studio/csprint.cpp b/contrib/samples/ogl/studio/csprint.cpp index cebd060248..c4bc38f4df 100644 --- a/contrib/samples/ogl/studio/csprint.cpp +++ b/contrib/samples/ogl/studio/csprint.cpp @@ -24,8 +24,7 @@ #include #endif -#include -#include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h #include @@ -190,7 +189,7 @@ bool wxDiagramClipboard::CopyToClipboard(double scale) if (!newBitmap->Ok()) { delete newBitmap; - + wxChar buf[200]; wxSprintf(buf, _T("Sorry, could not allocate clipboard bitmap (%dx%d)"), (maxX+10), (maxY+10)); wxMessageBox(buf, _T("Clipboard copy problem")); @@ -226,7 +225,7 @@ bool wxDiagramClipboard::CopyToClipboard(double scale) // Close clipboard wxCloseClipboard(); } - + delete newBitmap; delete mf; diff --git a/contrib/samples/ogl/studio/dialogs.cpp b/contrib/samples/ogl/studio/dialogs.cpp index 09e91a5fb8..c555e6c600 100644 --- a/contrib/samples/ogl/studio/dialogs.cpp +++ b/contrib/samples/ogl/studio/dialogs.cpp @@ -24,14 +24,14 @@ #include #endif -#include -#include #include "dialogs.h" #include "doc.h" #include "view.h" #include "studio.h" #include "studio_resources.h" +#if wxUSE_WX_RESOURCES + IMPLEMENT_CLASS(csLabelEditingDialog, wxDialog) BEGIN_EVENT_TABLE(csLabelEditingDialog, wxDialog) @@ -101,7 +101,7 @@ csSettingsDialog::csSettingsDialog(wxWindow* parent): m_generalSettings = new wxPanel; #ifdef __WXDEBUG__ - bool success = + bool success = #endif wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog")); wxASSERT_MSG( (success), _T("Could not load general settings panel.")); @@ -110,7 +110,7 @@ csSettingsDialog::csSettingsDialog(wxWindow* parent): m_diagramSettings = new wxPanel; #ifdef __WXDEBUG__ - success = + success = #endif wxLoadFromResource(m_diagramSettings, m_notebook, _T("diagram_settings_dialog")); wxASSERT_MSG( (success), _T("Could not load diagram settings panel.")); @@ -257,7 +257,7 @@ END_EVENT_TABLE() // For 400x400 settings dialog, size your panels to about 375x325 in dialog editor csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title, - wxPanel* attributeDialog, const wxString& attributeDialogName): + wxPanel* attributeDialog, const wxString& attributeDialogName): wxDialog(parent, wxID_ANY, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT)) { m_attributeDialog = attributeDialog; @@ -269,7 +269,7 @@ csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxStrin m_generalPropertiesDialog = new csGeneralShapePropertiesDialog; #ifdef __WXDEBUG__ - bool success = + bool success = #endif wxLoadFromResource(m_generalPropertiesDialog, m_notebook, _T("general_shape_properties_dialog")); wxASSERT_MSG( (success), _T("Could not load general properties panel.")); @@ -416,6 +416,8 @@ void csGeneralShapePropertiesDialog::SetShapeLabel(const wxString& label) textCtrl->SetValue(label); } +#endif // wxUSE_WX_RESOURCES + /* * csThinRectangleDialog */ diff --git a/contrib/samples/ogl/studio/dialogs.h b/contrib/samples/ogl/studio/dialogs.h index 69fedf280c..5db3a45728 100644 --- a/contrib/samples/ogl/studio/dialogs.h +++ b/contrib/samples/ogl/studio/dialogs.h @@ -19,6 +19,10 @@ #include #include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h + +#if wxUSE_WX_RESOURCES + /* * Label editing dialog (about to become obsolete) */ @@ -103,7 +107,7 @@ public: // Set some suitable defaults in the attribute dialogs (in the first instance, // just set all wxChoices to the first element) void SetDefaults(); - + // Accessors csGeneralShapePropertiesDialog* GetGeneralPropertiesDialog() const { return m_generalPropertiesDialog; } @@ -122,6 +126,8 @@ protected: DECLARE_EVENT_TABLE() }; +#endif // wxUSE_WX_RESOURCES + #define ID_SHAPE_PROPERTY_NOTEBOOK 1000 //// Specific attribute-editing panel classes below here @@ -243,6 +249,5 @@ public: DECLARE_EVENT_TABLE() }; - #endif // _STUDIO_DIALOGS_H_ diff --git a/contrib/samples/ogl/studio/doc.cpp b/contrib/samples/ogl/studio/doc.cpp index 8a76e6b40a..7057be0f79 100644 --- a/contrib/samples/ogl/studio/doc.cpp +++ b/contrib/samples/ogl/studio/doc.cpp @@ -53,6 +53,7 @@ bool csDiagramDocument::OnCloseDocument() return true; } +#if wxUSE_PROLOGIO bool csDiagramDocument::OnSaveDocument(const wxString& file) { if (file == wxEmptyString) @@ -97,9 +98,10 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file) SetFilename(file, true); Modify(false); UpdateAllViews(); - + return true; } +#endif // wxUSE_PROLOGIO /* @@ -268,7 +270,7 @@ bool csCommandState::Do() ((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false); m_shapeOnCanvas->Unlink(); - + m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas); m_savedState = m_shapeOnCanvas; @@ -347,7 +349,7 @@ bool csCommandState::Do() lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(), lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo()); - + lineShape->Show(true); wxClientDC dc(lineShape->GetCanvas()); @@ -475,7 +477,7 @@ bool csCommandState::Do() if (isSelected) m_shapeOnCanvas->Select(true, & dc); - + m_doc->Modify(true); m_doc->UpdateAllViews(); diff --git a/contrib/samples/ogl/studio/doc.h b/contrib/samples/ogl/studio/doc.h index a5bf77a7e4..ce1e3a7b86 100644 --- a/contrib/samples/ogl/studio/doc.h +++ b/contrib/samples/ogl/studio/doc.h @@ -20,16 +20,14 @@ #include #include -#include -#include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h -#include #include "shapes.h" /* * A diagram document, which contains a diagram. */ - + class csDiagramDocument: public wxDocument { DECLARE_DYNAMIC_CLASS(csDiagramDocument) @@ -37,11 +35,13 @@ public: csDiagramDocument(); ~csDiagramDocument(); +#if wxUSE_PROLOGIO bool OnSaveDocument(const wxString& file); bool OnOpenDocument(const wxString& file); - +#endif // wxUSE_PROLOGIO + inline wxDiagram *GetDiagram() { return &m_diagram; } - + bool OnCloseDocument(); protected: @@ -71,7 +71,7 @@ protected: */ - + class csCommandState; class csDiagramCommand: public wxCommand { diff --git a/contrib/samples/ogl/studio/mainfrm.cpp b/contrib/samples/ogl/studio/mainfrm.cpp index 4a7e4ac4b3..cc4730c01f 100644 --- a/contrib/samples/ogl/studio/mainfrm.cpp +++ b/contrib/samples/ogl/studio/mainfrm.cpp @@ -80,9 +80,11 @@ void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event)) void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_WX_RESOURCES csSettingsDialog* dialog = new csSettingsDialog(this); /* int ret = */ dialog->ShowModal(); dialog->Destroy(); +#endif // wxUSE_WX_RESOURCES } void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) diff --git a/contrib/samples/ogl/studio/shapes.cpp b/contrib/samples/ogl/studio/shapes.cpp index 7ca63c9c90..44c61728e2 100644 --- a/contrib/samples/ogl/studio/shapes.cpp +++ b/contrib/samples/ogl/studio/shapes.cpp @@ -28,15 +28,12 @@ #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h! #endif -#include -#include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h #include "studio.h" #include "doc.h" #include "shapes.h" #include "view.h" -#include -#include #include "cspalette.h" #include "dialogs.h" @@ -682,6 +679,9 @@ bool csEvtHandler::EditProperties() return false; } + wxString newLabel(m_label); + +#if wxUSE_WX_RESOURCES csShapePropertiesDialog* dialog = new csShapePropertiesDialog(shape->GetCanvas()->GetParent(), title, attributeDialog, attributeDialogName); dialog->GetGeneralPropertiesDialog()->SetShapeLabel(m_label); if (dialog->ShowModal() == wxID_CANCEL) @@ -690,8 +690,11 @@ bool csEvtHandler::EditProperties() return false; } - wxString newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel(); + newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel(); dialog->Destroy(); +#else + wxUnusedVar(attributeDialog); +#endif // wxUSE_WX_RESOURCES wxShape* newShape = shape->CreateNewCopy(); @@ -708,6 +711,7 @@ bool csEvtHandler::EditProperties() * Diagram */ +#if wxUSE_PROLOGIO bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr) { wxDiagram::OnShapeSave(db, shape, expr); @@ -726,6 +730,7 @@ bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr) return true; } +#endif // wxUSE_PROLOGIO IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape) diff --git a/contrib/samples/ogl/studio/shapes.h b/contrib/samples/ogl/studio/shapes.h index 2e959dff4d..5c24d65aab 100644 --- a/contrib/samples/ogl/studio/shapes.h +++ b/contrib/samples/ogl/studio/shapes.h @@ -18,10 +18,7 @@ #include #include -#include -#include - -#include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h #include #include #include @@ -31,15 +28,17 @@ class csDiagramDocument; /* * Override a few members for this application */ - + class csDiagram: public wxDiagram { DECLARE_CLASS(csDiagram) public: csDiagram(csDiagramDocument* doc) { m_doc = doc; } ~csDiagram(); +#if wxUSE_PROLOGIO bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr); bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr); +#endif // wxUSE_PROLOGIO inline csDiagramDocument* GetDocument() const { return m_doc; } virtual void Redraw(wxDC& dc); @@ -206,7 +205,7 @@ public: /* * Temporary arc label object */ - + class csLabelShape: public wxLabelShape { DECLARE_DYNAMIC_CLASS(csLabelShape) diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp index bbb4af14d5..e1b657418b 100644 --- a/contrib/samples/ogl/studio/studio.cpp +++ b/contrib/samples/ogl/studio/studio.cpp @@ -21,8 +21,8 @@ #include "wx/mdi.h" #endif -#include -#include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h + #include "wx/config.h" #include "wx/laywin.h" @@ -92,11 +92,13 @@ csApp::~csApp() // Initialise this in OnInit, not statically bool csApp::OnInit(void) { +#if wxUSE_WX_RESOURCES if (!wxResourceParseFile(_T("studio_resources.wxr"))) { wxMessageBox(_T("Could not find or parse resource file: studio_resources.wxr"), _T("Studio")); return false; } +#endif #if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__) m_helpController = new wxWinHelpController; @@ -224,7 +226,7 @@ int csApp::OnExit(void) * Centralised code for creating a document frame. * Called from view.cpp, when a view is created. */ - + wxMDIChildFrame *csApp::CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenuRet) { //// Make a child frame diff --git a/contrib/samples/ogl/studio/symbols.cpp b/contrib/samples/ogl/studio/symbols.cpp index 204604e046..69d3a719cf 100644 --- a/contrib/samples/ogl/studio/symbols.cpp +++ b/contrib/samples/ogl/studio/symbols.cpp @@ -24,8 +24,7 @@ #include #endif -#include -#include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.h #include "studio.h" #include "doc.h" @@ -189,7 +188,7 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too memDC.SelectObject(wxNullBitmap); #endif -#if 1 +#if 1 wxMemoryDC memDC; double height, width, maxSize; diff --git a/contrib/samples/ogl/studio/symbols.h b/contrib/samples/ogl/studio/symbols.h index b3db979a30..72b503c491 100644 --- a/contrib/samples/ogl/studio/symbols.h +++ b/contrib/samples/ogl/studio/symbols.h @@ -19,10 +19,7 @@ #include #include -#include -#include - -#include +#include // 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 5a157a8704..9fac0a9b07 100644 --- a/contrib/samples/ogl/studio/view.cpp +++ b/contrib/samples/ogl/studio/view.cpp @@ -877,6 +877,9 @@ void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys)) if (palette->GetSelection() == PALETTE_TEXT_TOOL) { + wxString newLabel; + +#if wxUSE_WX_RESOURCES // Ask for a label and create a new free-floating text region csLabelEditingDialog* dialog = new csLabelEditingDialog(GetParent()); @@ -888,8 +891,9 @@ void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys)) return; } - wxString newLabel = dialog->GetShapeLabel(); + newLabel = dialog->GetShapeLabel(); dialog->Destroy(); +#endif // wxUSE_WX_RESOURCES wxShape* shape = new csTextBoxShape; shape->AssignNewIds(); -- 2.45.2