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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-01 16:09:27 +00:00
parent 47f797bd30
commit eb839c8423
2 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
samples/mdi/mdi.cpp
View File

@@ -109,8 +109,8 @@ bool MyApp::OnInit()
{ {
// Create the main frame window // Create the main frame window
frame = new MyFrame((wxFrame *)NULL, -1, _T("MDI Demo"), frame = new MyFrame((wxFrame *)NULL, wxID_ANY, _T("MDI Demo"),
wxPoint(-1, -1), wxSize(500, 400), wxDefaultPosition, wxSize(500, 400),
wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL); wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
#ifdef __WXMSW__ #ifdef __WXMSW__
#if 0 #if 0
@@ -147,11 +147,11 @@ bool MyApp::OnInit()
frame->CreateStatusBar(); frame->CreateStatusBar();
frame->Show(TRUE); frame->Show(true);
SetTopWindow(frame); SetTopWindow(frame);
return TRUE; return true;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -168,7 +168,7 @@ MyFrame::MyFrame(wxWindow *parent,
: wxMDIParentFrame(parent, id, title, pos, size, : wxMDIParentFrame(parent, id, title, pos, size,
style | wxNO_FULL_REPAINT_ON_RESIZE) style | wxNO_FULL_REPAINT_ON_RESIZE)
{ {
textWindow = new wxTextCtrl(this, -1, _T("A help window"), textWindow = new wxTextCtrl(this, wxID_ANY, _T("A help window"),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxSUNKEN_BORDER); wxTE_MULTILINE | wxSUNKEN_BORDER);
@@ -219,9 +219,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
{ {
// Make another frame, containing a canvas // Make another frame, containing a canvas
MyChild *subframe = new MyChild(frame, _T("Canvas Frame"), MyChild *subframe = new MyChild(frame, _T("Canvas Frame"));
wxPoint(-1, -1), wxSize(-1, -1),
wxDEFAULT_FRAME_STYLE);
wxString title; wxString title;
title.Printf(_T("Canvas Frame %d"), ++gs_nFrames); title.Printf(_T("Canvas Frame %d"), ++gs_nFrames);
@@ -274,7 +272,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
// Give it scrollbars // Give it scrollbars
canvas->SetScrollbars(20, 20, 50, 50); canvas->SetScrollbars(20, 20, 50, 50);
subframe->Show(TRUE); subframe->Show(true);
} }
void MyFrame::OnSize(wxSizeEvent& void MyFrame::OnSize(wxSizeEvent&
@@ -316,24 +314,24 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
int width = 24; int width = 24;
int currentX = 5; int currentX = 5;
toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("New file")); toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("New file"));
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Open file")); toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Open file"));
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Save file")); toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Save file"));
currentX += width + 5; currentX += width + 5;
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Copy")); toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Copy"));
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Cut")); toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Cut"));
currentX += width + 5; currentX += width + 5;
toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Paste")); toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Paste"));
currentX += width + 5; currentX += width + 5;
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Print")); toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Print"));
currentX += width + 5; currentX += width + 5;
toolBar->AddSeparator(); toolBar->AddSeparator();
toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, _T("Help")); toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, true, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Help"));
toolBar->Realize(); toolBar->Realize();
@@ -349,14 +347,14 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
// Define a constructor for my canvas // Define a constructor for my canvas
MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size) MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
: wxScrolledWindow(parent, -1, pos, size, : wxScrolledWindow(parent, wxID_ANY, pos, size,
wxSUNKEN_BORDER | wxSUNKEN_BORDER |
wxNO_FULL_REPAINT_ON_RESIZE | wxNO_FULL_REPAINT_ON_RESIZE |
wxVSCROLL | wxHSCROLL) wxVSCROLL | wxHSCROLL)
{ {
SetBackgroundColour(wxColour(_T("WHITE"))); SetBackgroundColour(wxColour(_T("WHITE")));
m_dirty = FALSE; m_dirty = false;
} }
// Define the repainting behaviour // Define the repainting behaviour
@@ -401,7 +399,7 @@ void MyCanvas::OnEvent(wxMouseEvent& event)
dc.SetPen(*wxBLACK_PEN); dc.SetPen(*wxBLACK_PEN);
dc.DrawLine(xpos, ypos, pt.x, pt.y); dc.DrawLine(xpos, ypos, pt.x, pt.y);
m_dirty = TRUE; m_dirty = true;
} }
xpos = pt.x; xpos = pt.x;
@@ -412,11 +410,9 @@ void MyCanvas::OnEvent(wxMouseEvent& event)
// MyChild // MyChild
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title)
const wxPoint& pos, const wxSize& size, : wxMDIChildFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize,
const long style) wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
: wxMDIChildFrame(parent, -1, title, pos, size,
style | wxNO_FULL_REPAINT_ON_RESIZE)
{ {
canvas = (MyCanvas *) NULL; canvas = (MyCanvas *) NULL;
my_children.Append(this); my_children.Append(this);
@@ -432,7 +428,7 @@ MyChild::~MyChild()
void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
{ {
Close(TRUE); Close(true);
} }
void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event)) void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))

2
samples/mdi/mdi.h
View File

@@ -58,7 +58,7 @@ class MyChild: public wxMDIChildFrame
{ {
public: public:
MyCanvas *canvas; MyCanvas *canvas;
MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style); MyChild(wxMDIParentFrame *parent, const wxString& title);
~MyChild(); ~MyChild();
void OnActivate(wxActivateEvent& event); void OnActivate(wxActivateEvent& event);