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

-1->wxID_ANY, TRUE->true, FALSE->false and tabs replacements. Correct help system in non MSW builds of OGL-Studio sample.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-09 16:42:34 +00:00
parent 45b8a2566d
commit 2ba06d5a8c
50 changed files with 835 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/samples/ogl/studio/cspalette.cpp
View File

@@ -6,7 +6,7 @@
// Created: 12/07/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -59,7 +59,7 @@ bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
{
// BEGIN mutual exclusivity code
if (toggled && (m_currentlySelected != -1) && (toolIndex != m_currentlySelected))
ToggleTool(m_currentlySelected, FALSE);
ToggleTool(m_currentlySelected, false);
if (toggled)
m_currentlySelected = toolIndex;
@@ -67,7 +67,7 @@ bool csEditorToolPalette::OnLeftClick(int toolIndex, bool toggled)
m_currentlySelected = -1;
// END mutual exclusivity code
return TRUE;
return true;
}
void csEditorToolPalette::OnMouseEnter(int toolIndex)
@@ -93,10 +93,10 @@ void csEditorToolPalette::SetSelection(int sel)
{
if ((sel != m_currentlySelected) && (m_currentlySelected != -1))
{
ToggleTool(m_currentlySelected, FALSE);
ToggleTool(m_currentlySelected, false);
}
m_currentlySelected = sel;
ToggleTool(m_currentlySelected, TRUE);
ToggleTool(m_currentlySelected, true);
}
bool csApp::CreatePalette(wxFrame *parent)
@@ -107,11 +107,11 @@ bool csApp::CreatePalette(wxFrame *parent)
win->SetOrientation(wxLAYOUT_HORIZONTAL);
win->SetAlignment(wxLAYOUT_TOP);
win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
win->SetSashVisible(wxSASH_BOTTOM, TRUE);
win->SetSashVisible(wxSASH_BOTTOM, true);
m_diagramPaletteSashWindow = win;
m_diagramPaletteSashWindow->Show(FALSE);
m_diagramPaletteSashWindow->Show(false);
// Load palette bitmaps
#ifdef __WXMSW__
@@ -124,14 +124,14 @@ bool csApp::CreatePalette(wxFrame *parent)
wxSize toolBitmapSize(22, 22);
#endif
csEditorToolPalette *palette = new csEditorToolPalette(m_diagramPaletteSashWindow, ID_DIAGRAM_PALETTE, wxPoint(0, 0), wxSize(-1, -1), wxTB_HORIZONTAL|wxNO_BORDER);
csEditorToolPalette *palette = new csEditorToolPalette(m_diagramPaletteSashWindow, ID_DIAGRAM_PALETTE, wxPoint(0, 0), wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER);
palette->SetMargins(2, 2);
palette->SetToolBitmapSize(toolBitmapSize);
palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, _T("Pointer"));
palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, TRUE, 0, -1, NULL, _T("Text"));
palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Pointer"));
palette->AddTool(PALETTE_TEXT_TOOL, TextTool, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, _T("Text"));
wxChar** symbols = new wxChar*[20];
int noSymbols = 0;
@@ -171,7 +171,7 @@ bool csApp::CreatePalette(wxFrame *parent)
if (symbol)
{
wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, TRUE, 0, -1, NULL, symbol->GetName());
palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, symbol->GetName());
delete bitmap;
}
@@ -185,7 +185,7 @@ bool csApp::CreatePalette(wxFrame *parent)
csSymbol* symbol = (csSymbol*) node->Data();
wxBitmap* bitmap = GetSymbolDatabase()->CreateToolBitmap(symbol, toolBitmapSize);
palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, TRUE, 0, -1, NULL, symbol->GetName());
palette->AddTool(symbol->GetToolId(), *bitmap, wxNullBitmap, true, 0, wxDefaultPosition.y, NULL, symbol->GetName());
delete bitmap;
@@ -198,6 +198,6 @@ bool csApp::CreatePalette(wxFrame *parent)
palette->SetSelection(PALETTE_ARROW);
m_diagramPalette = palette;
return TRUE;
return true;
}

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

@@ -6,7 +6,7 @@
// Created: 12/07/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _STUDIO_CSPALETTE_H_
@@ -37,7 +37,7 @@ class csEditorToolPalette: public TOOLPALETTECLASS
{
public:
csEditorToolPalette(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
csEditorToolPalette(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTB_VERTICAL);

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

@@ -6,7 +6,7 @@
// Created: 12/07/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -45,14 +45,14 @@ bool wxDiagramClipboard::Copy(wxDiagram* diagram)
{
DeleteAllShapes();
return DoCopy(diagram, this, FALSE, NULL);
return DoCopy(diagram, this, false, NULL);
}
// Copy contents to the diagram, with new ids.
bool wxDiagramClipboard::Paste(wxDiagram* diagram, wxDC* dc, int offsetX, int offsetY)
{
return DoCopy(this, diagram, TRUE, dc, offsetX, offsetY);
return DoCopy(this, diagram, true, dc, offsetX, offsetY);
}
// Universal copy function (to or from clipboard).
@@ -161,7 +161,7 @@ bool wxDiagramClipboard::DoCopy(wxDiagram* diagramFrom, wxDiagram* diagramTo, bo
OnEndCopy(diagramTo);
return TRUE;
return true;
}
#ifdef __WXMSW__
@@ -194,7 +194,7 @@ bool wxDiagramClipboard::CopyToClipboard(double scale)
wxChar buf[200];
wxSprintf(buf, _T("Sorry, could not allocate clipboard bitmap (%dx%d)"), (maxX+10), (maxY+10));
wxMessageBox(buf, _T("Clipboard copy problem"));
return FALSE;
return false;
}
wxMemoryDC memDC;
@@ -248,10 +248,10 @@ bool wxDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxD
if (dc && (diagramTo != this))
{
newShape->Select(TRUE, dc);
newShape->Select(true, dc);
}
return TRUE;
return true;
}
/*
@@ -265,24 +265,24 @@ bool csDiagramClipboard::OnStartCopy(wxDiagram* diagramTo)
{
// Do nothing if copying to the clipboard
if (diagramTo == this)
return TRUE;
return true;
// Deselect all objects initially.
csDiagram* diagram = (csDiagram*) diagramTo;
csDiagramDocument* doc = diagram->GetDocument();
((csDiagramView*)doc->GetFirstView())->SelectAll(FALSE);
((csDiagramView*)doc->GetFirstView())->SelectAll(false);
m_currentCmd = new csDiagramCommand(_T("Paste"), doc);
return TRUE;
return true;
}
bool csDiagramClipboard::OnEndCopy(wxDiagram* diagramTo)
{
// Do nothing if copying to the clipboard
if (diagramTo == this)
return TRUE;
return true;
csDiagram* diagram = (csDiagram*) diagramTo;
csDiagramDocument* doc = diagram->GetDocument();
@@ -299,7 +299,7 @@ bool csDiagramClipboard::OnEndCopy(wxDiagram* diagramTo)
m_currentCmd = NULL;
}
}
return TRUE;
return true;
}
// Use the command framework to add the shapes, if we're copying to a diagram and
@@ -321,7 +321,7 @@ bool csDiagramClipboard::OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxD
m_currentCmd->AddState(new csCommandState(ID_CS_ADD_SHAPE_SELECT, newShape, NULL));
}
return TRUE;
return true;
}

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

@@ -90,7 +90,7 @@ END_EVENT_TABLE()
// For 400x400 settings dialog, size your panels to about 375x325 in dialog editor
csSettingsDialog::csSettingsDialog(wxWindow* parent):
wxDialog(parent, -1, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT))
wxDialog(parent, wxID_ANY, _T("Settings"), wxPoint(0, 0), wxSize(PROPERTY_DIALOG_WIDTH, PROPERTY_DIALOG_HEIGHT))
{
m_generalSettings = NULL;
m_diagramSettings = NULL;
@@ -105,7 +105,7 @@ csSettingsDialog::csSettingsDialog(wxWindow* parent):
#endif
wxLoadFromResource(m_generalSettings, m_notebook, _T("general_settings_dialog"));
wxASSERT_MSG( (success), _T("Could not load general settings panel."));
m_notebook->AddPage(m_generalSettings, _T("General"), TRUE);
m_notebook->AddPage(m_generalSettings, _T("General"), true);
m_diagramSettings = new wxPanel;
@@ -181,7 +181,7 @@ bool csSettingsDialog::TransferDataToWindow()
str.Printf(_T("%d"), wxGetApp().GetGridSpacing());
gridSpacing->SetValue(str);
return TRUE;
return true;
}
bool csSettingsDialog::TransferDataFromWindow()
@@ -201,7 +201,7 @@ bool csSettingsDialog::TransferDataFromWindow()
if (wxGetApp().GetGridStyle() == csGRID_STYLE_DOTTED)
{
wxMessageBox(_T("Dotted grid style not yet implemented."), _T("Studio"), wxICON_EXCLAMATION);
return FALSE;
return false;
}
// Apply settings to all open diagram documents
@@ -219,12 +219,12 @@ bool csSettingsDialog::TransferDataFromWindow()
{
case csGRID_STYLE_NONE:
{
diagram->SetSnapToGrid(FALSE);
diagram->SetSnapToGrid(false);
break;
}
case csGRID_STYLE_INVISIBLE:
{
diagram->SetSnapToGrid(TRUE);
diagram->SetSnapToGrid(true);
break;
}
case csGRID_STYLE_DOTTED:
@@ -237,7 +237,7 @@ bool csSettingsDialog::TransferDataFromWindow()
node = node->GetNext();
}
return TRUE;
return true;
}
/*
@@ -258,7 +258,7 @@ END_EVENT_TABLE()
csShapePropertiesDialog::csShapePropertiesDialog(wxWindow* parent, const wxString& title,
wxPanel* attributeDialog, const wxString& attributeDialogName):
wxDialog(parent, -1, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT))
wxDialog(parent, wxID_ANY, title, wxPoint(0, 0), wxSize(SHAPE_PROPERTY_DIALOG_WIDTH, SHAPE_PROPERTY_DIALOG_HEIGHT))
{
m_attributeDialog = attributeDialog;
m_alternativeAttributeDialog = NULL;

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

@@ -6,7 +6,7 @@
// Created: 12/07/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -50,13 +50,13 @@ csDiagramDocument::~csDiagramDocument()
bool csDiagramDocument::OnCloseDocument()
{
m_diagram.DeleteAllShapes();
return TRUE;
return true;
}
bool csDiagramDocument::OnSaveDocument(const wxString& file)
{
if (file == wxEmptyString)
return FALSE;
return false;
if (!m_diagram.SaveFile(file))
{
@@ -68,18 +68,18 @@ bool csDiagramDocument::OnSaveDocument(const wxString& file)
(void)wxMessageBox(_T("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
GetDocumentWindow());
return FALSE;
return false;
}
Modify(FALSE);
Modify(false);
SetFilename(file);
return TRUE;
return true;
}
bool csDiagramDocument::OnOpenDocument(const wxString& file)
{
if (!OnSaveModified())
return FALSE;
return false;
wxString msgTitle;
if (wxTheApp->GetAppName() != wxEmptyString)
@@ -92,15 +92,15 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
{
(void)wxMessageBox(_T("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
GetDocumentWindow());
return FALSE;
return false;
}
SetFilename(file, TRUE);
Modify(FALSE);
SetFilename(file, true);
Modify(false);
UpdateAllViews();
return TRUE;
return true;
}
/*
* Implementation of drawing command
@@ -108,7 +108,7 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc,
csCommandState* onlyState):
wxCommand(TRUE, name)
wxCommand(true, name)
{
m_doc = doc;
@@ -190,10 +190,10 @@ bool csDiagramCommand::Do()
{
csCommandState* state = (csCommandState*) node->GetData();
if (!state->Do())
return FALSE;
return false;
node = node->GetNext();
}
return TRUE;
return true;
}
bool csDiagramCommand::Undo()
@@ -205,10 +205,10 @@ bool csDiagramCommand::Undo()
{
csCommandState* state = (csCommandState*) node->GetData();
if (!state->Undo())
return FALSE;
return false;
node = node->GetPrevious();
}
return TRUE;
return true;
}
csCommandState::csCommandState(int cmd, wxShape* savedState, wxShape* shapeOnCanvas)
@@ -264,8 +264,8 @@ bool csCommandState::Do()
m_linePositionTo = lineTo->GetLinePosition(lineShape);
}
m_shapeOnCanvas->Select(FALSE);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, FALSE);
m_shapeOnCanvas->Select(false);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
m_shapeOnCanvas->Unlink();
@@ -288,7 +288,7 @@ bool csCommandState::Do()
lineTo->MoveLinks(dc);
}
m_doc->Modify(TRUE);
m_doc->Modify(true);
m_doc->UpdateAllViews();
break;
}
@@ -309,7 +309,7 @@ bool csCommandState::Do()
m_savedState = NULL;
m_doc->GetDiagram()->AddShape(m_shapeOnCanvas);
m_shapeOnCanvas->Show(TRUE);
m_shapeOnCanvas->Show(true);
wxClientDC dc(m_shapeOnCanvas->GetCanvas());
m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
@@ -321,11 +321,11 @@ bool csCommandState::Do()
if (m_cmd == ID_CS_ADD_SHAPE_SELECT)
{
m_shapeOnCanvas->Select(TRUE, &dc);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, TRUE);
m_shapeOnCanvas->Select(true, &dc);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
}
m_doc->Modify(TRUE);
m_doc->Modify(true);
m_doc->UpdateAllViews();
break;
}
@@ -348,7 +348,7 @@ bool csCommandState::Do()
lineShape->GetFrom()->AddLine(lineShape, lineShape->GetTo(),
lineShape->GetAttachmentFrom(), lineShape->GetAttachmentTo());
lineShape->Show(TRUE);
lineShape->Show(true);
wxClientDC dc(lineShape->GetCanvas());
lineShape->GetCanvas()->PrepareDC(dc);
@@ -360,11 +360,11 @@ bool csCommandState::Do()
if (m_cmd == ID_CS_ADD_LINE_SELECT)
{
lineShape->Select(TRUE, &dc);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, TRUE);
lineShape->Select(true, &dc);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, true);
}
m_doc->Modify(TRUE);
m_doc->Modify(true);
m_doc->UpdateAllViews();
break;
}
@@ -401,7 +401,7 @@ bool csCommandState::Do()
bool isSelected = m_shapeOnCanvas->Selected();
if (isSelected)
m_shapeOnCanvas->Select(FALSE, & dc);
m_shapeOnCanvas->Select(false, & dc);
if (m_cmd == ID_CS_SIZE || m_cmd == ID_CS_ROTATE_CLOCKWISE || m_cmd == ID_CS_ROTATE_ANTICLOCKWISE ||
m_cmd == ID_CS_CHANGE_LINE_ORDERING || m_cmd == ID_CS_CHANGE_LINE_ATTACHMENT)
@@ -454,11 +454,11 @@ bool csCommandState::Do()
m_shapeOnCanvas->SetSize(width, height);
m_shapeOnCanvas->Move(dc, m_shapeOnCanvas->GetX(), m_shapeOnCanvas->GetY());
m_shapeOnCanvas->Show(TRUE);
m_shapeOnCanvas->Show(true);
// Recursively redraw links if we have a composite.
if (m_shapeOnCanvas->GetChildren().GetCount() > 0)
m_shapeOnCanvas->DrawLinks(dc, -1, TRUE);
m_shapeOnCanvas->DrawLinks(dc, -1, true);
m_shapeOnCanvas->GetEventHandler()->OnEndSize(width, height);
}
@@ -474,15 +474,15 @@ bool csCommandState::Do()
}
if (isSelected)
m_shapeOnCanvas->Select(TRUE, & dc);
m_shapeOnCanvas->Select(true, & dc);
m_doc->Modify(TRUE);
m_doc->Modify(true);
m_doc->UpdateAllViews();
break;
}
}
return TRUE;
return true;
}
bool csCommandState::Undo()
@@ -514,9 +514,9 @@ bool csCommandState::Undo()
lineShape->GetTo()->MoveLinks(dc);
}
m_shapeOnCanvas->Show(TRUE);
m_shapeOnCanvas->Show(true);
m_doc->Modify(TRUE);
m_doc->Modify(true);
m_doc->UpdateAllViews();
break;
}
@@ -547,8 +547,8 @@ bool csCommandState::Undo()
wxClientDC dc(m_shapeOnCanvas->GetCanvas());
m_shapeOnCanvas->GetCanvas()->PrepareDC(dc);
m_shapeOnCanvas->Select(FALSE, &dc);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, FALSE);
m_shapeOnCanvas->Select(false, &dc);
((csDiagramView*) m_doc->GetFirstView())->SelectShape(m_shapeOnCanvas, false);
m_doc->GetDiagram()->RemoveShape(m_shapeOnCanvas);
m_shapeOnCanvas->Unlink(); // Unlinks the line, if it is a line
@@ -564,7 +564,7 @@ bool csCommandState::Undo()
m_savedState = m_shapeOnCanvas;
m_shapeOnCanvas = NULL;
m_doc->Modify(TRUE);
m_doc->Modify(true);
m_doc->UpdateAllViews();
break;
}
@@ -591,6 +591,6 @@ bool csCommandState::Undo()
}
}
return TRUE;
return true;
}

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

@@ -6,7 +6,7 @@
// Created: 12/07/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _STUDIO_DOC_H_

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

@@ -52,8 +52,7 @@ BEGIN_EVENT_TABLE(csFrame, wxDocMDIParentFrame)
END_EVENT_TABLE()
// Define my frame constructor
csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
long style):
csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
wxDocMDIParentFrame(manager, parent, id, title, pos, size, style, _T("frame"))
{
CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
@@ -73,7 +72,10 @@ csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wx
void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
{
wxGetApp().GetHelpController().DisplayContents();
wxHelpControllerBase* help;
help = wxGetApp().GetHelpController();
if (help)
help->DisplayContents();
}
void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
@@ -85,7 +87,7 @@ void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
Close(TRUE);
Close(true);
}
void csFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -155,24 +157,24 @@ void csFrame::OnIdle(wxIdleEvent& event)
wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
if (!paletteWin || !diagramToolBarWin)
return;
bool doLayout = FALSE;
bool doLayout = false;
if (GetActiveChild())
{
if (!paletteWin->IsShown() || !diagramToolBarWin->IsShown())
{
paletteWin->Show(TRUE);
diagramToolBarWin->Show(TRUE);
paletteWin->Show(true);
diagramToolBarWin->Show(true);
doLayout = TRUE;
doLayout = true;
}
}
else
{
if (paletteWin->IsShown() || diagramToolBarWin->IsShown())
{
paletteWin->Show(FALSE);
diagramToolBarWin->Show(FALSE);
doLayout = TRUE;
paletteWin->Show(false);
diagramToolBarWin->Show(false);
doLayout = true;
}
}
if (doLayout)
@@ -206,7 +208,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
// General handler for disabling items
void csFrame::OnUpdateDisable(wxUpdateUIEvent& event)
{
event.Enable(FALSE);
event.Enable(false);
}
void csFrame::OnSaveUpdate(wxUpdateUIEvent& event)

9
contrib/samples/ogl/studio/project.cpp
View File

@@ -31,8 +31,7 @@ BEGIN_EVENT_TABLE(csProjectTreeCtrl, wxTreeCtrl)
END_EVENT_TABLE()
// Define my frame constructor
csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
long style):
csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
wxTreeCtrl(parent, id, pos, size, style),
m_imageList(16, 16)
@@ -58,7 +57,7 @@ bool csApp::CreateProjectWindow(wxFrame *WXUNUSED(parent))
win->SetOrientation(wxLAYOUT_VERTICAL);
win->SetAlignment(wxLAYOUT_LEFT);
win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
win->SetSashVisible(wxSASH_RIGHT, TRUE);
win->SetSashVisible(wxSASH_RIGHT, true);
win->SetExtraBorderSize(5);
m_projectSashWindow = win;
@@ -67,10 +66,10 @@ bool csApp::CreateProjectWindow(wxFrame *WXUNUSED(parent))
wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT|wxDOUBLE_BORDER);
// For now, hide the window
m_projectSashWindow->Show(FALSE);
m_projectSashWindow->Show(false);
#endif
return TRUE;
return true;
}
// Fill out the project tree control

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

@@ -6,7 +6,7 @@
// Created: 12/07/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -130,7 +130,7 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
// If the shape was selected, deselect it and vice versa.
bool selected = GetShape()->Selected();
view->SelectAll(FALSE);
view->SelectAll(false);
selected = !selected;
@@ -143,13 +143,13 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
{
if (GetShape()->Selected())
{
GetShape()->Select(FALSE, &dc);
view->SelectShape(GetShape(), FALSE);
GetShape()->Select(false, &dc);
view->SelectShape(GetShape(), false);
}
else
{
GetShape()->Select(TRUE, &dc);
view->SelectShape(GetShape(), TRUE);
GetShape()->Select(true, &dc);
view->SelectShape(GetShape(), true);
}
GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing
}
@@ -477,7 +477,7 @@ void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, i
wxClientDC dc(canvas);
canvas->PrepareDC(dc);
shape->SetDisableLabel(FALSE);
shape->SetDisableLabel(false);
if (lpt->m_type == CONTROL_POINT_LINE)
{
@@ -529,7 +529,7 @@ void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, i
shape->Recompute();
shape->ResetControlPoints();
if (!pt->m_eraseObject)
shape->Show(FALSE);
shape->Show(false);
*/
wxShape* newShape = shape->CreateNewCopy();
@@ -612,7 +612,7 @@ bool csEvtHandler::EditProperties()
// For now, no line property editing
if (shape->IsKindOf(CLASSINFO(wxLineShape)))
return FALSE;
return false;
csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView();
@@ -677,7 +677,7 @@ bool csEvtHandler::EditProperties()
else
{
wxMessageBox(_T("Unrecognised shape."), _T("Studio"), wxICON_EXCLAMATION);
return FALSE;
return false;
}
csShapePropertiesDialog* dialog = new csShapePropertiesDialog(shape->GetCanvas()->GetParent(), title, attributeDialog, attributeDialogName);
@@ -685,7 +685,7 @@ bool csEvtHandler::EditProperties()
if (dialog->ShowModal() == wxID_CANCEL)
{
dialog->Destroy();
return FALSE;
return false;
}
wxString newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel();
@@ -699,7 +699,7 @@ bool csEvtHandler::EditProperties()
view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Edit properties"), (csDiagramDocument*) view->GetDocument(),
new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, shape)));
return TRUE;
return true;
}
/*
@@ -711,7 +711,7 @@ bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
wxDiagram::OnShapeSave(db, shape, expr);
csEvtHandler *handler = (csEvtHandler *)shape.GetEventHandler();
expr.AddAttributeValueString(_T("label"), handler->m_label);
return TRUE;
return true;
}
bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
@@ -722,7 +722,7 @@ bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
csEvtHandler *handler = new csEvtHandler(&shape, &shape, label);
shape.SetEventHandler(handler);
return TRUE;
return true;
}
IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)
@@ -741,7 +741,7 @@ csThinRectangleShape::csThinRectangleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE);
SetCentreResize(false);
}
IMPLEMENT_DYNAMIC_CLASS(csWideRectangleShape, wxDrawnShape)
@@ -760,7 +760,7 @@ csWideRectangleShape::csWideRectangleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE);
SetCentreResize(false);
}
IMPLEMENT_DYNAMIC_CLASS(csTriangleShape, wxDrawnShape)
@@ -814,7 +814,7 @@ csTriangleShape::csTriangleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE);
SetCentreResize(false);
}
IMPLEMENT_DYNAMIC_CLASS(csSemiCircleShape, wxDrawnShape)
@@ -911,7 +911,7 @@ csSemiCircleShape::csSemiCircleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE);
SetCentreResize(false);
}
IMPLEMENT_DYNAMIC_CLASS(csCircleShape, wxCircleShape)
@@ -926,7 +926,7 @@ csCircleShape::csCircleShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE);
SetCentreResize(false);
}
IMPLEMENT_DYNAMIC_CLASS(csCircleShadowShape, wxCircleShape)
@@ -941,7 +941,7 @@ csCircleShadowShape::csCircleShadowShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE);
SetCentreResize(false);
SetShadowMode(SHADOW_RIGHT);
}
@@ -971,7 +971,7 @@ csOctagonShape::csOctagonShape()
SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE);
SetCentreResize(false);
}
// This is a transparent shape for drawing around other shapes.
@@ -983,7 +983,7 @@ csGroupShape::csGroupShape()
SetBrush(wxTRANSPARENT_BRUSH);
SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH);
SetCentreResize(FALSE);
SetCentreResize(false);
}
void csGroupShape::OnDraw(wxDC& dc)
@@ -1013,20 +1013,20 @@ bool csGroupShape::HitTest(double x, double y, int* attachment, double* distance
if (x >= x1 && x <= x2)
{
if ((y >= y1 - edgeTolerance) && (y <= y1 + edgeTolerance))
return TRUE;
return true;
if ((y <= y2 + edgeTolerance) && (y >= y2 - edgeTolerance))
return TRUE;
return true;
}
// Left/right edges
if (y >= y1 && y <= y2)
{
if ((x >= x1 - edgeTolerance) && (x <= x1 + edgeTolerance))
return TRUE;
return true;
if ((x <= x2 + edgeTolerance) && (x >= x2 - edgeTolerance))
return TRUE;
return true;
}
return FALSE;
return false;
}
IMPLEMENT_DYNAMIC_CLASS(csTextBoxShape, wxRectangleShape)
@@ -1040,7 +1040,7 @@ csTextBoxShape::csTextBoxShape()
SetAttachmentMode(ATTACHMENT_MODE_NONE);
SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
SetCentreResize(FALSE);
SetCentreResize(false);
}
IMPLEMENT_DYNAMIC_CLASS(csLineShape, wxLineShape)
@@ -1066,7 +1066,7 @@ bool csLineShape::OnMoveMiddleControlPoint(wxDC& WXUNUSED(dc), wxLineControlPoin
view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Move line point"), (csDiagramDocument*) view->GetDocument(),
new csCommandState(ID_CS_MOVE_LINE_POINT, newShape, this)));
return TRUE;
return true;
}
wxLabelShape* csLineShape::OnCreateLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h)
@@ -1085,7 +1085,7 @@ bool csLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, d
view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Move label", (csDiagramDocument*) view->GetDocument(),
new csCommandState(ID_CS_MOVE_LABEL, newShape, this)));
return TRUE;
return true;
}
#endif

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

@@ -73,8 +73,8 @@ public:
// Overridables
// Start/end copying
virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };
virtual bool OnEndCopy(wxDiagram* WXUNUSED(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

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

@@ -95,10 +95,16 @@ bool csApp::OnInit(void)
if (!wxResourceParseFile(_T("studio_resources.wxr")))
{
wxMessageBox(_T("Could not find or parse resource file: studio_resources.wxr"), _T("Studio"));
return FALSE;
return false;
}
m_helpController.Initialize(_T("studio.hlp"));
#if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__)
m_helpController = new wxWinHelpController;
#else
m_helpController = new wxHtmlHelpController;
#endif
m_helpController->Initialize(_T("studio.hlp"));
ReadOptions();
@@ -121,7 +127,7 @@ bool csApp::OnInit(void)
#define wxDEFAULT_FRAME_STYLE_NO_CLIP \
(wxDEFAULT_FRAME_STYLE & ~wxCLIP_CHILDREN)
csFrame* frame = new csFrame(m_docManager, NULL, -1, _T("OGL Studio"), m_mainFramePos, m_mainFrameSize,
csFrame* frame = new csFrame(m_docManager, NULL, wxID_ANY, _T("OGL Studio"), m_mainFramePos, m_mainFrameSize,
wxDEFAULT_FRAME_STYLE_NO_CLIP | wxHSCROLL | wxVSCROLL);
// Give it an icon
@@ -184,11 +190,11 @@ bool csApp::OnInit(void)
m_shapeEditMenu->AppendSeparator();
m_shapeEditMenu->Append(ID_CS_CUT, _T("Cut"));
frame->Show(TRUE);
frame->Show(true);
SetTopWindow(frame);
return TRUE;
return true;
}
int csApp::OnExit(void)
@@ -204,6 +210,9 @@ int csApp::OnExit(void)
delete m_shapeEditMenu;
m_shapeEditMenu = NULL;
delete m_helpController;
m_helpController = NULL;
wxOGLCleanUp();
return 0;
@@ -217,7 +226,7 @@ int csApp::OnExit(void)
wxMDIChildFrame *csApp::CreateChildFrame(wxDocument *doc, wxView *view, wxMenu** editMenuRet)
{
//// Make a child frame
csMDIChildFrame *subframe = new csMDIChildFrame(doc, view, ((wxDocMDIParentFrame*)GetTopWindow()), -1, _T("Child Frame"),
csMDIChildFrame *subframe = new csMDIChildFrame(doc, view, ((wxDocMDIParentFrame*)GetTopWindow()), wxID_ANY, _T("Child Frame"),
wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE);
#ifdef __WXMSW__
@@ -336,28 +345,28 @@ void csApp::InitToolBar(wxToolBar* toolBar)
#error "Not implemented for this platform."
#endif
toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, FALSE, -1, -1, NULL, _T("New file"));
toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, FALSE, -1, -1, NULL, _T("Open file"));
toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, FALSE, -1, -1, NULL, _T("Save file"));
toolBar->AddTool(wxID_NEW, *bitmaps[0], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("New file"));
toolBar->AddTool(wxID_OPEN, *bitmaps[1], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Open file"));
toolBar->AddTool(wxID_SAVE, *bitmaps[2], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Save file"));
toolBar->AddSeparator();
toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, FALSE, -1, -1, NULL, _T("Print"));
toolBar->AddTool(wxID_PRINT, *bitmaps[6], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Print"));
toolBar->AddSeparator();
toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, FALSE, -1, -1, NULL, _T("Copy"));
toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, FALSE, -1, -1, NULL, _T("Cut"));
toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, FALSE, -1, -1, NULL, _T("Paste"));
toolBar->AddTool(wxID_COPY, *bitmaps[3], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Copy"));
toolBar->AddTool(wxID_CUT, *bitmaps[4], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Cut"));
toolBar->AddTool(wxID_PASTE, *bitmaps[5], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Paste"));
toolBar->AddSeparator();
toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, FALSE, -1, -1, NULL, _T("Undo"));
toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, FALSE, -1, -1, NULL, _T("Redo"));
toolBar->AddTool(wxID_UNDO, *bitmaps[8], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Undo"));
toolBar->AddTool(wxID_REDO, *bitmaps[9], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Redo"));
toolBar->AddSeparator();
toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, FALSE, -1, -1, NULL, _T("Help"));
toolBar->AddTool(wxID_HELP, *bitmaps[7], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Help"));
toolBar->Realize();
toolBar->EnableTool(wxID_COPY, FALSE);
toolBar->EnableTool(wxID_PASTE, FALSE);
toolBar->EnableTool(wxID_PRINT, FALSE);
toolBar->EnableTool(wxID_UNDO, FALSE);
toolBar->EnableTool(wxID_REDO, FALSE);
toolBar->EnableTool(wxID_COPY, false);
toolBar->EnableTool(wxID_PASTE, false);
toolBar->EnableTool(wxID_PRINT, false);
toolBar->EnableTool(wxID_UNDO, false);
toolBar->EnableTool(wxID_REDO, false);
int i;
for (i = 0; i < 10; i++)
@@ -375,10 +384,10 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
m_diagramToolBarSashWindow = win;
m_diagramToolBarSashWindow->Show(FALSE);
m_diagramToolBarSashWindow->Show(false);
// Create the actual toolbar
m_diagramToolBar = new wxToolBar(win, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT);
m_diagramToolBar = new wxToolBar(win, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT);
wxBitmap* bitmaps[11];
@@ -410,18 +419,18 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
#error "Not implemented for this platform."
#endif
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align left"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align right"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNT, *bitmaps[2], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align top"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNB, *bitmaps[3], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align bottom"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_HORIZ, *bitmaps[4], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align horizontally"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_VERT, *bitmaps[5], wxNullBitmap, FALSE, -1, -1, NULL, _T("Align vertically"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_COPY_SIZE, *bitmaps[6], wxNullBitmap, FALSE, -1, -1, NULL, _T("Copy size"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNL, *bitmaps[0], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align left"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNR, *bitmaps[1], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align right"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNT, *bitmaps[2], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align top"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGNB, *bitmaps[3], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align bottom"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_HORIZ, *bitmaps[4], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align horizontally"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_ALIGN_VERT, *bitmaps[5], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Align vertically"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_COPY_SIZE, *bitmaps[6], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Copy size"));
m_diagramToolBar->AddSeparator();
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_LINE_ARROW, *bitmaps[7], wxNullBitmap, TRUE, -1, -1, NULL, _T("Toggle arrow"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_NEW_POINT, *bitmaps[8], wxNullBitmap, FALSE, -1, -1, NULL, _T("New line point"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_CUT_POINT, *bitmaps[9], wxNullBitmap, FALSE, -1, -1, NULL, _T("Cut line point"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_STRAIGHTEN, *bitmaps[10], wxNullBitmap, FALSE, -1, -1, NULL, _T("Straighten lines"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_LINE_ARROW, *bitmaps[7], wxNullBitmap, true, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Toggle arrow"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_NEW_POINT, *bitmaps[8], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("New line point"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_CUT_POINT, *bitmaps[9], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Cut line point"));
m_diagramToolBar->AddTool(DIAGRAM_TOOLBAR_STRAIGHTEN, *bitmaps[10], wxNullBitmap, false, wxDefaultPosition.x, wxDefaultPosition.y, NULL, _T("Straighten lines"));
m_diagramToolBar->Realize();
@@ -500,7 +509,7 @@ bool csApp::ReadOptions()
config.Read(_T("gridStyle"), & m_gridStyle);
config.Read(_T("gridSpacing"), & m_gridSpacing);
return TRUE;
return true;
}
bool csApp::WriteOptions()
@@ -516,6 +525,6 @@ bool csApp::WriteOptions()
m_docManager->FileHistorySave(config);
return TRUE;
return true;
}

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

@@ -14,6 +14,13 @@
#include <wx/docmdi.h>
#include <wx/help.h>
#include <wx/cshelp.h>
#include <wx/helphtml.h>
#ifdef __WXMSW__
#include <wx/msw/helpchm.h>
#else
#include <wx/html/helpctrl.h>
#endif
#include <wx/ogl/ogl.h>
#include <wx/ogl/canvas.h>
@@ -81,7 +88,7 @@ public:
wxMenu* GetShapeEditMenu() const { return m_shapeEditMenu; }
wxDiagramClipboard& GetDiagramClipboard() const { return (wxDiagramClipboard&) m_diagramClipboard; }
wxDocManager* GetDocManager() const { return m_docManager; }
wxHelpController& GetHelpController() const { return (wxHelpController&) m_helpController; }
wxHelpControllerBase* GetHelpController() const { return m_helpController; }
int GetGridStyle() const { return m_gridStyle; }
void SetGridStyle(int style) { m_gridStyle = style; }
@@ -112,7 +119,7 @@ protected:
csDiagramClipboard m_diagramClipboard;
// Help instance
wxHelpController m_helpController;
wxHelpControllerBase* m_helpController;
};
DECLARE_APP(csApp)

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

@@ -212,7 +212,7 @@ wxBitmap* csSymbolDatabase::CreateToolBitmap(csSymbol* symbol, const wxSize& too
memDC.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE), wxSOLID));
memDC.Clear();
symbol->GetShape()->Show(TRUE);
symbol->GetShape()->Show(true);
symbol->GetShape()->Move(memDC, centreX, centreY);
memDC.SelectObject(wxNullBitmap);

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

@@ -95,7 +95,7 @@ bool csDiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
canvas->SetView(this);
SetFrame(frame);
Activate(TRUE);
Activate(true);
// Initialize the edit menu Undo and Redo items
doc->GetCommandProcessor()->SetEditMenu(editMenu);
@@ -112,12 +112,12 @@ bool csDiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
{
case csGRID_STYLE_NONE:
{
diagramDoc->GetDiagram()->SetSnapToGrid(FALSE);
diagramDoc->GetDiagram()->SetSnapToGrid(false);
break;
}
case csGRID_STYLE_INVISIBLE:
{
diagramDoc->GetDiagram()->SetSnapToGrid(TRUE);
diagramDoc->GetDiagram()->SetSnapToGrid(true);
break;
}
case csGRID_STYLE_DOTTED:
@@ -128,7 +128,7 @@ bool csDiagramView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
}
return TRUE;
return true;
}
csDiagramView::~csDiagramView(void)
@@ -155,7 +155,7 @@ void csDiagramView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
bool csDiagramView::OnClose(bool deleteWindow)
{
if (!GetDocument()->Close())
return FALSE;
return false;
csDiagramDocument *diagramDoc = (csDiagramDocument *)GetDocument();
diagramDoc->GetDiagram()->SetCanvas(NULL);
@@ -170,15 +170,15 @@ bool csDiagramView::OnClose(bool deleteWindow)
// Remove file menu from those managed by the command history
wxGetApp().GetDocManager()->FileHistoryRemoveMenu(fileMenu);
Activate(FALSE);
frame->Show(FALSE);
Activate(false);
frame->Show(false);
if (deleteWindow)
{
frame->Destroy();
}
return TRUE;
return true;
}
// Adds or removes shape from m_selections
@@ -192,7 +192,7 @@ void csDiagramView::SelectShape(wxShape* shape, bool select)
void csDiagramView::OnSelectAll(wxCommandEvent& WXUNUSED(event))
{
SelectAll(TRUE);
SelectAll(true);
}
wxShape *csDiagramView::FindFirstSelectedShape(void)
@@ -389,7 +389,7 @@ void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
if (selections.GetCount() > 0)
{
wxColourData data;
data.SetChooseFull(TRUE);
data.SetChooseFull(true);
if (selections.GetCount() == 1)
{
wxShape* firstShape = (wxShape*) selections.GetFirst()->GetData();
@@ -404,7 +404,7 @@ void csDiagramView::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
wxColour col = retData.GetColour();
theBrush = wxTheBrushList->FindOrCreateBrush(col, wxSOLID);
}
dialog->Close(TRUE);
dialog->Close(true);
if (!theBrush)
return;
@@ -535,8 +535,8 @@ void csDiagramView::SelectAll(bool select)
while (node)
{
wxShape *theShape = (wxShape*) node->GetData();
theShape->Select(FALSE, &dc);
SelectShape(theShape, FALSE);
theShape->Select(false, &dc);
SelectShape(theShape, false);
node = node->GetNext();
}
@@ -552,8 +552,8 @@ void csDiagramView::SelectAll(bool select)
!eachShape->IsKindOf(CLASSINFO(wxControlPoint)) &&
!eachShape->IsKindOf(CLASSINFO(wxLabelShape)))
{
eachShape->Select(TRUE, &dc);
SelectShape(eachShape, TRUE);
eachShape->Select(true, &dc);
SelectShape(eachShape, true);
}
node = node->GetNext();
}
@@ -633,13 +633,13 @@ void csDiagramView::ReflectPointSize(int pointSize)
// Make the arrow toggle button reflect the state of the line
void csDiagramView::ReflectArrowState(wxLineShape* lineShape)
{
bool haveArrow = FALSE;
bool haveArrow = false;
wxNode *node = lineShape->GetArrows().GetFirst();
while (node)
{
wxArrowHead *arrow = (wxArrowHead *)node->GetData();
if (ARROW_POSITION_MIDDLE == arrow->GetArrowEnd())
haveArrow = TRUE;
haveArrow = true;
node = node->GetNext();
}
@@ -868,7 +868,7 @@ void csCanvas::OnLeftClick(double x, double y, int WXUNUSED(keys))
if (palette->GetSelection() == PALETTE_ARROW)
{
GetView()->SelectAll(FALSE);
GetView()->SelectAll(false);
wxClientDC dc(this);
PrepareDC(dc);
@@ -1010,8 +1010,8 @@ void csCanvas::OnEndDragLeft(double x, double y, int WXUNUSED(keys))
if (image_x >= min_x && image_x <= max_x &&
image_y >= min_y && image_y <= max_y)
{
shape->Select(TRUE, &dc);
GetView()->SelectShape(shape, TRUE);
shape->Select(true, &dc);
GetView()->SelectShape(shape, true);
}
}
node = node->GetNext();

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

@@ -6,7 +6,7 @@
// Created: 12/07/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _STUDIO_VIEW_H_
@@ -25,7 +25,7 @@ class csCanvas: public wxShapeCanvas
DECLARE_CLASS(csCanvas)
public:
csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = -1,
csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxRETAINED);
~csCanvas(void);
@@ -65,7 +65,7 @@ class csDiagramView: public wxView
bool OnCreate(wxDocument *doc, long flags);
void OnDraw(wxDC *dc);
void OnUpdate(wxView *sender, wxObject *hint = NULL);
bool OnClose(bool deleteWindow = TRUE);
bool OnClose(bool deleteWindow = true);
void OnSelectAll(wxCommandEvent& event);
wxShape *FindFirstSelectedShape(void);
@@ -95,7 +95,7 @@ class csDiagramView: public wxView
void DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op);
// Select or deselect all
void SelectAll(bool select = TRUE);
void SelectAll(bool select = true);
// Event handlers
void OnCut(wxCommandEvent& event);