// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-// #pragma implementation
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "wx/wx.h"
#endif
-#if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
#endif
#include "docview.h"
// What to do when a view is created. Creates actual
// windows for displaying the view.
-bool DrawingView::OnCreate(wxDocument *doc, long flags)
+bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
{
- if (!singleWindowMode)
- {
- // Multiple windows
- frame = wxGetApp().CreateChildFrame(doc, this, TRUE);
- frame->SetTitle("DrawingView");
-
- canvas = GetMainFrame()->CreateCanvas(this, frame);
+ if (!singleWindowMode)
+ {
+ // Multiple windows
+ frame = wxGetApp().CreateChildFrame(doc, this, true);
+ frame->SetTitle(_T("DrawingView"));
+
+ canvas = GetMainFrame()->CreateCanvas(this, frame);
#ifdef __X__
- // X seems to require a forced resize
- int x, y;
- frame->GetSize(&x, &y);
- frame->SetSize(x, y);
+ // X seems to require a forced resize
+ int x, y;
+ frame->GetSize(&x, &y);
+ frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);
#endif
- frame->Show(TRUE);
- }
- else
- {
- // Single-window mode
- frame = GetMainFrame();
- canvas = GetMainFrame()->canvas;
- canvas->view = this;
-
- // Associate the appropriate frame with this view.
- SetFrame(frame);
-
- // Make sure the document manager knows that this is the
- // current view.
- Activate(TRUE);
-
- // Initialize the edit menu Undo and Redo items
- doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu);
- doc->GetCommandProcessor()->Initialize();
- }
-
- return TRUE;
+ frame->Show(true);
+ }
+ else
+ {
+ // Single-window mode
+ frame = GetMainFrame();
+ canvas = GetMainFrame()->canvas;
+ canvas->view = this;
+
+ // Associate the appropriate frame with this view.
+ SetFrame(frame);
+
+ // Make sure the document manager knows that this is the
+ // current view.
+ Activate(true);
+
+ // Initialize the edit menu Undo and Redo items
+ doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu);
+ doc->GetCommandProcessor()->Initialize();
+ }
+
+ return true;
}
// Sneakily gets used for default print/preview
// as well as drawing on the screen.
void DrawingView::OnDraw(wxDC *dc)
{
- dc->SetFont(*wxNORMAL_FONT);
- dc->SetPen(*wxBLACK_PEN);
-
- wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().First();
- while (node)
- {
- DoodleSegment *seg = (DoodleSegment *)node->Data();
- seg->Draw(dc);
- node = node->Next();
- }
+ dc->SetFont(*wxNORMAL_FONT);
+ dc->SetPen(*wxBLACK_PEN);
+
+ wxList::compatibility_iterator node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst();
+ while (node)
+ {
+ DoodleSegment *seg = (DoodleSegment *)node->GetData();
+ seg->Draw(dc);
+ node = node->GetNext();
+ }
}
-void DrawingView::OnUpdate(wxView *sender, wxObject *hint)
+void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
{
- if (canvas)
- canvas->Refresh();
-
+ if (canvas)
+ canvas->Refresh();
+
/* Is the following necessary?
-#ifdef __WINDOWS__
- if (canvas)
- canvas->Refresh();
+#ifdef __WXMSW__
+ if (canvas)
+ canvas->Refresh();
#else
- if (canvas)
+ if (canvas)
{
- wxClientDC dc(canvas);
- dc.Clear();
- OnDraw(& dc);
+ wxClientDC dc(canvas);
+ dc.Clear();
+ OnDraw(& dc);
}
#endif
*/
// Clean up windows used for displaying the view.
bool DrawingView::OnClose(bool deleteWindow)
{
- if (!GetDocument()->Close())
- return FALSE;
-
- // Clear the canvas in case we're in single-window mode,
- // and the canvas stays.
- canvas->Clear();
- canvas->view = NULL;
- canvas = NULL;
-
- wxString s(wxTheApp->GetAppName());
- if (frame)
- frame->SetTitle(s);
-
- SetFrame(NULL);
-
- Activate(FALSE);
-
- if (deleteWindow && !singleWindowMode)
- {
- delete frame;
- return TRUE;
- }
- return TRUE;
+ if (!GetDocument()->Close())
+ return false;
+
+ // Clear the canvas in case we're in single-window mode,
+ // and the canvas stays.
+ canvas->ClearBackground();
+ canvas->view = (wxView *) NULL;
+ canvas = (MyCanvas *) NULL;
+
+ wxString s(wxTheApp->GetAppName());
+ if (frame)
+ frame->SetTitle(s);
+
+ SetFrame((wxFrame *) NULL);
+
+ Activate(false);
+
+ if (deleteWindow && !singleWindowMode)
+ {
+ delete frame;
+ return true;
+ }
+ return true;
}
-void DrawingView::OnCut(wxCommandEvent& event)
+void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
{
DrawingDocument *doc = (DrawingDocument *)GetDocument();
- doc->GetCommandProcessor()->Submit(new DrawingCommand("Cut Last Segment", DOODLE_CUT, doc, NULL));
+ doc->GetCommandProcessor()->Submit(new DrawingCommand(_T("Cut Last Segment"), DOODLE_CUT, doc, (DoodleSegment *) NULL));
}
IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
-bool TextEditView::OnCreate(wxDocument *doc, long flags)
+bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
{
- frame = wxGetApp().CreateChildFrame(doc, this, FALSE);
-
- int width, height;
- frame->GetClientSize(&width, &height);
- textsw = new MyTextWindow(this, frame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE);
- frame->SetTitle("TextEditView");
-
+ frame = wxGetApp().CreateChildFrame(doc, this, false);
+
+ int width, height;
+ frame->GetClientSize(&width, &height);
+ textsw = new MyTextWindow(this, frame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE);
+ frame->SetTitle(_T("TextEditView"));
+
#ifdef __X__
- // X seems to require a forced resize
- int x, y;
- frame->GetSize(&x, &y);
- frame->SetSize(x, y);
+ // X seems to require a forced resize
+ int x, y;
+ frame->GetSize(&x, &y);
+ frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);
#endif
-
- frame->Show(TRUE);
- Activate(TRUE);
-
- return TRUE;
+
+ frame->Show(true);
+ Activate(true);
+
+ return true;
}
// Handled by wxTextWindow
-void TextEditView::OnDraw(wxDC *dc)
+void TextEditView::OnDraw(wxDC *WXUNUSED(dc) )
{
}
-void TextEditView::OnUpdate(wxView *sender, wxObject *hint)
+void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
{
}
bool TextEditView::OnClose(bool deleteWindow)
{
- if (!GetDocument()->Close())
- return FALSE;
+ if (!GetDocument()->Close())
+ return false;
- Activate(FALSE);
-
- if (deleteWindow)
- {
- delete frame;
- return TRUE;
- }
- return TRUE;
+ Activate(false);
+
+ if (deleteWindow)
+ {
+ delete frame;
+ return true;
+ }
+ return true;
}
/*
- * Window implementations
- */
+* Window implementations
+*/
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
// Define a constructor for my canvas
MyCanvas::MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style):
- wxScrolledWindow(frame, -1, pos, size, style)
+ wxScrolledWindow(frame, wxID_ANY, pos, size, style)
{
- view = v;
+ view = v;
}
// Define the repainting behaviour
void MyCanvas::OnDraw(wxDC& dc)
{
- if (view)
- view->OnDraw(& dc);
+ if (view)
+ view->OnDraw(& dc);
}
// This implements a tiny doodling program. Drag the mouse using
// the left button.
void MyCanvas::OnMouseEvent(wxMouseEvent& event)
{
- if (!view)
- return;
+ if (!view)
+ return;
- static DoodleSegment *currentSegment = NULL;
-
- wxClientDC dc(this);
- PrepareDC(dc);
-
- dc.SetPen(*wxBLACK_PEN);
-
- wxPoint pt(event.GetLogicalPosition(dc));
-
- if (currentSegment && event.LeftUp())
- {
- if (currentSegment->lines.Number() == 0)
+ static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
+
+ wxClientDC dc(this);
+ PrepareDC(dc);
+
+ dc.SetPen(*wxBLACK_PEN);
+
+ wxPoint pt(event.GetLogicalPosition(dc));
+
+ if (currentSegment && event.LeftUp())
{
- delete currentSegment;
- currentSegment = NULL;
+ if (currentSegment->lines.GetCount() == 0)
+ {
+ delete currentSegment;
+ currentSegment = (DoodleSegment *) NULL;
+ }
+ else
+ {
+ // We've got a valid segment on mouse left up, so store it.
+ DrawingDocument *doc = (DrawingDocument *)view->GetDocument();
+
+ doc->GetCommandProcessor()->Submit(new DrawingCommand(_T("Add Segment"), DOODLE_ADD, doc, currentSegment));
+
+ view->GetDocument()->Modify(true);
+ currentSegment = (DoodleSegment *) NULL;
+ }
}
- else
+
+ if (xpos > -1 && ypos > -1 && event.Dragging())
{
- // We've got a valid segment on mouse left up, so store it.
- DrawingDocument *doc = (DrawingDocument *)view->GetDocument();
-
- doc->GetCommandProcessor()->Submit(new DrawingCommand("Add Segment", DOODLE_ADD, doc, currentSegment));
-
- view->GetDocument()->Modify(TRUE);
- currentSegment = NULL;
+ if (!currentSegment)
+ currentSegment = new DoodleSegment;
+
+ DoodleLine *newLine = new DoodleLine;
+ newLine->x1 = (long)xpos;
+ newLine->y1 = (long)ypos;
+ newLine->x2 = pt.x;
+ newLine->y2 = pt.y;
+ currentSegment->lines.Append(newLine);
+
+ dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y);
}
- }
-
- if (xpos > -1 && ypos > -1 && event.Dragging())
- {
- if (!currentSegment)
- currentSegment = new DoodleSegment;
-
- DoodleLine *newLine = new DoodleLine;
- newLine->x1 = xpos; newLine->y1 = ypos;
- newLine->x2 = pt.x; newLine->y2 = pt.y;
- currentSegment->lines.Append(newLine);
-
- dc.DrawLine(xpos, ypos, pt.x, pt.y);
- }
- xpos = pt.x;
- ypos = pt.y;
+ xpos = pt.x;
+ ypos = pt.y;
}
// Define a constructor for my text subwindow
MyTextWindow::MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style):
- wxTextCtrl(frame, -1, "", pos, size, style)
+ wxTextCtrl(frame, wxID_ANY, _T(""), pos, size, style)
{
- view = v;
+ view = v;
}
projects / wxWidgets.git / blobdiff