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

-1->wxID_ANY, TRUE->true, FALSE->false, wxDefaultPosition & wxDefaultSize replacements

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-05-27 18:07:04 +00:00
parent 5014bb3a2f
commit f2aea0d1ce
5 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
samples/docview/view.cpp
View File

@@ -49,7 +49,7 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
if (!singleWindowMode)
{
// Multiple windows
frame = wxGetApp().CreateChildFrame(doc, this, TRUE);
frame = wxGetApp().CreateChildFrame(doc, this, true);
frame->SetTitle(_T("DrawingView"));
canvas = GetMainFrame()->CreateCanvas(this, frame);
@@ -57,9 +57,9 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
// X seems to require a forced resize
int x, y;
frame->GetSize(&x, &y);
frame->SetSize(-1, -1, x, y);
frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, x, y);
#endif
frame->Show(TRUE);
frame->Show(true);
}
else
{
@@ -73,14 +73,14 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
// Make sure the document manager knows that this is the
// current view.
Activate(TRUE);
Activate(true);
// Initialize the edit menu Undo and Redo items
doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu);
doc->GetCommandProcessor()->Initialize();
}
return TRUE;
return true;
}
// Sneakily gets used for default print/preview
@@ -123,7 +123,7 @@ void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
bool DrawingView::OnClose(bool deleteWindow)
{
if (!GetDocument()->Close())
return FALSE;
return false;
// Clear the canvas in case we're in single-window mode,
// and the canvas stays.
@@ -137,14 +137,14 @@ bool DrawingView::OnClose(bool deleteWindow)
SetFrame((wxFrame *) NULL);
Activate(FALSE);
Activate(false);
if (deleteWindow && !singleWindowMode)
{
delete frame;
return TRUE;
return true;
}
return TRUE;
return true;
}
void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
@@ -157,7 +157,7 @@ IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
{
frame = wxGetApp().CreateChildFrame(doc, this, FALSE);
frame = wxGetApp().CreateChildFrame(doc, this, false);
int width, height;
frame->GetClientSize(&width, &height);
@@ -168,13 +168,13 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
// X seems to require a forced resize
int x, y;
frame->GetSize(&x, &y);
frame->SetSize(-1, -1, x, y);
frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, x, y);
#endif
frame->Show(TRUE);
Activate(TRUE);
frame->Show(true);
Activate(true);
return TRUE;
return true;
}
// Handled by wxTextWindow
@@ -189,16 +189,16 @@ void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
bool TextEditView::OnClose(bool deleteWindow)
{
if (!GetDocument()->Close())
return FALSE;
return false;
Activate(FALSE);
Activate(false);
if (deleteWindow)
{
delete frame;
return TRUE;
return true;
}
return TRUE;
return true;
}
/*
@@ -211,7 +211,7 @@ END_EVENT_TABLE()
// 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;
}
@@ -253,7 +253,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
doc->GetCommandProcessor()->Submit(new DrawingCommand(_T("Add Segment"), DOODLE_ADD, doc, currentSegment));
view->GetDocument()->Modify(TRUE);
view->GetDocument()->Modify(true);
currentSegment = (DoodleSegment *) NULL;
}
}
@@ -278,7 +278,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
// 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, _T(""), pos, size, style)
wxTextCtrl(frame, wxID_ANY, _T(""), pos, size, style)
{
view = v;
}