#ifndef _STUDIO_SHAPES_H_
#define _STUDIO_SHAPES_H_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
// #pragma interface
#endif
#include <wx/docview.h>
#include <wx/string.h>
-#include <wx/wxexpr.h>
+#include <wx/deprecated/setup.h>
+#include <wx/deprecated/wxexpr.h>
#include <wx/ogl/ogl.h>
#include <wx/ogl/basicp.h>
// Overridables
// Start/end copying
- virtual bool OnStartCopy(wxDiagram* diagramTo) { return TRUE; };
- virtual bool OnEndCopy(wxDiagram* diagramTo) { return TRUE; };
+ virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };
+ virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };
// Override this to e.g. have the shape added through a Do/Undo command system.
// By default, we'll just add it directly to the destination diagram, and
~csDiagramClipboard() {}
// Start/end copying
- bool OnStartCopy(wxDiagram* diagramTo);
- bool OnEndCopy(wxDiagram* diagramTo);
+ virtual bool OnStartCopy(wxDiagram* diagramTo);
+ virtual bool OnEndCopy(wxDiagram* diagramTo);
- bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
+ virtual bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
protected:
csDiagramCommand* m_currentCmd;
{
DECLARE_DYNAMIC_CLASS(csEvtHandler)
public:
- csEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = "");
+ csEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL, const wxString& lab = wxEmptyString);
~csEvtHandler();
void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);