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

OGL samples again buildable after deprecated/setup.h turned off by default. Minor cleaning where applicable.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-31 19:18:25 +00:00
parent 694f70fa9c
commit cecdcad1db
18 changed files with 112 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/samples/ogl/studio/cspalette.h
View File

@@ -18,19 +18,13 @@
#include <wx/wx.h>
#include <wx/string.h>
#include <wx/deprecated/tbarsmpl.h>
#include <wx/ogl/ogl.h> // 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

7
contrib/samples/ogl/studio/csprint.cpp
View File

@@ -24,8 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/deprecated/setup.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
#include <wx/clipbrd.h>
@@ -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;

14
contrib/samples/ogl/studio/dialogs.cpp
View File

@@ -24,14 +24,14 @@
#include <wx/wx.h>
#endif
#include <wx/deprecated/setup.h>
#include <wx/deprecated/resource.h>
#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
*/

9
contrib/samples/ogl/studio/dialogs.h
View File

@@ -19,6 +19,10 @@
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/ogl/ogl.h> // 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_

10
contrib/samples/ogl/studio/doc.cpp
View File

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

14
contrib/samples/ogl/studio/doc.h
View File

@@ -20,16 +20,14 @@
#include <wx/cmdproc.h>
#include <wx/string.h>
#include <wx/deprecated/setup.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
#include <wx/ogl/ogl.h>
#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
{

2
contrib/samples/ogl/studio/mainfrm.cpp
View File

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

15
contrib/samples/ogl/studio/shapes.cpp
View File

@@ -28,15 +28,12 @@
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#endif
#include <wx/deprecated/setup.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
#include "studio.h"
#include "doc.h"
#include "shapes.h"
#include "view.h"
#include <wx/ogl/basicp.h>
#include <wx/ogl/linesp.h>
#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)

11
contrib/samples/ogl/studio/shapes.h
View File

@@ -18,10 +18,7 @@
#include <wx/docview.h>
#include <wx/string.h>
#include <wx/deprecated/setup.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/ogl.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>
@@ -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)

8
contrib/samples/ogl/studio/studio.cpp
View File

@@ -21,8 +21,8 @@
#include "wx/mdi.h"
#endif
#include <wx/deprecated/setup.h>
#include <wx/deprecated/resource.h>
#include <wx/ogl/ogl.h> // 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

5
contrib/samples/ogl/studio/symbols.cpp
View File

@@ -24,8 +24,7 @@
#include <wx/wx.h>
#endif
#include <wx/deprecated/setup.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/ogl.h> // 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;

5
contrib/samples/ogl/studio/symbols.h
View File

@@ -19,10 +19,7 @@
#include <wx/docview.h>
#include <wx/string.h>
#include <wx/deprecated/setup.h>
#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/ogl.h>
#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
/*
* csSymbol

6
contrib/samples/ogl/studio/view.cpp
View File

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