X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c52d95b412d81372e2705d5e1c03a0417af79ade..781a24e82f6c7e460f3dcc925570de4f5fc38f4f:/samples/mdi/mdi.cpp diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp index ebcd2cc977..d80dbd294a 100644 --- a/samples/mdi/mdi.cpp +++ b/samples/mdi/mdi.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -29,20 +29,22 @@ #include "wx/mdi.h" #endif -#include +#include "wx/toolbar.h" -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if !defined(__WXMSW__) #include "mondrian.xpm" - #include "bitmaps/new.xpm" - #include "bitmaps/open.xpm" - #include "bitmaps/save.xpm" - #include "bitmaps/copy.xpm" - #include "bitmaps/cut.xpm" - #include "bitmaps/paste.xpm" - #include "bitmaps/print.xpm" - #include "bitmaps/help.xpm" #endif +#include "bitmaps/new.xpm" +#include "bitmaps/open.xpm" +#include "bitmaps/save.xpm" +#include "bitmaps/copy.xpm" +#include "bitmaps/cut.xpm" +#include "bitmaps/paste.xpm" +#include "bitmaps/print.xpm" +#include "bitmaps/help.xpm" + + #include "mdi.h" IMPLEMENT_APP(MyApp) @@ -80,6 +82,12 @@ END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit) EVT_MENU(MDI_REFRESH, MyChild::OnRefresh) + EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle) + EVT_MENU(MDI_CHANGE_POSITION, MyChild::OnChangePosition) + EVT_MENU(MDI_CHANGE_SIZE, MyChild::OnChangeSize) + + EVT_SIZE(MyChild::OnSize) + EVT_MOVE(MyChild::OnMove) EVT_CLOSE(MyChild::OnClose) END_EVENT_TABLE() @@ -101,13 +109,21 @@ bool MyApp::OnInit() { // Create the main frame window - frame = new MyFrame((wxFrame *)NULL, -1, "MDI Demo", - wxPoint(-1, -1), wxSize(500, 400), + frame = new MyFrame((wxFrame *)NULL, wxID_ANY, _T("MDI Demo"), + wxDefaultPosition, wxSize(500, 400), wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL); +#ifdef __WXMSW__ +#if 0 + // Experimental: change the window menu + wxMenu* windowMenu = new wxMenu; + windowMenu->Append(5000, _T("My menu item!")); + frame->SetWindowMenu(windowMenu); +#endif +#endif // Give it an icon #ifdef __WXMSW__ - frame->SetIcon(wxIcon("mdi_icn")); + frame->SetIcon(wxIcon(_T("mdi_icn"))); #else frame->SetIcon(wxIcon( mondrian_xpm )); #endif @@ -115,27 +131,27 @@ bool MyApp::OnInit() // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(MDI_NEW_WINDOW, "&New window", "Create a new child window"); - file_menu->Append(MDI_QUIT, "&Exit", "Quit the program"); + file_menu->Append(MDI_NEW_WINDOW, _T("&New window\tCtrl-N"), _T("Create a new child window")); + file_menu->Append(MDI_QUIT, _T("&Exit\tAlt-X"), _T("Quit the program")); wxMenu *help_menu = new wxMenu; - help_menu->Append(MDI_ABOUT, "&About"); + help_menu->Append(MDI_ABOUT, _T("&About\tF1")); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); - menu_bar->Append(help_menu, "&Help"); + menu_bar->Append(file_menu, _T("&File")); + menu_bar->Append(help_menu, _T("&Help")); // Associate the menu bar with the frame frame->SetMenuBar(menu_bar); frame->CreateStatusBar(); - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } // --------------------------------------------------------------------------- @@ -149,14 +165,17 @@ MyFrame::MyFrame(wxWindow *parent, const wxPoint& pos, const wxSize& size, const long style) - : wxMDIParentFrame(parent, id, title, pos, size, style) + : wxMDIParentFrame(parent, id, title, pos, size, + style | wxNO_FULL_REPAINT_ON_RESIZE) { - textWindow = new wxTextCtrl(this, -1, "A help window", + textWindow = new wxTextCtrl(this, wxID_ANY, _T("A help window"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); +#if wxUSE_TOOLBAR CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL); InitToolBar(GetToolBar()); +#endif // wxUSE_TOOLBAR // Accelerators wxAcceleratorEntry entries[3]; @@ -172,8 +191,8 @@ void MyFrame::OnClose(wxCloseEvent& event) if ( event.CanVeto() && (gs_nFrames > 0) ) { wxString msg; - msg.Printf("%d windows still open, close anyhow?", gs_nFrames); - if ( wxMessageBox(msg, "Please confirm", + msg.Printf(_T("%d windows still open, close anyhow?"), gs_nFrames); + if ( wxMessageBox(msg, _T("Please confirm"), wxICON_QUESTION | wxYES_NO) != wxYES ) { event.Veto(); @@ -192,26 +211,24 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) { - (void)wxMessageBox("wxWindows 2.0 MDI Demo\n" - "Author: Julian Smart (c) 1997\n" - "Usage: mdi.exe", "About MDI Demo"); + (void)wxMessageBox(_T("wxWidgets 2.0 MDI Demo\n") + _T("Author: Julian Smart (c) 1997\n") + _T("Usage: mdi.exe"), _T("About MDI Demo")); } void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) { // Make another frame, containing a canvas - MyChild *subframe = new MyChild(frame, "Canvas Frame", - wxPoint(-1, -1), wxSize(-1, -1), - wxDEFAULT_FRAME_STYLE); + MyChild *subframe = new MyChild(frame, _T("Canvas Frame")); wxString title; - title.Printf("Canvas Frame %d", ++gs_nFrames); + title.Printf(_T("Canvas Frame %d"), ++gs_nFrames); subframe->SetTitle(title); // Give it an icon #ifdef __WXMSW__ - subframe->SetIcon(wxIcon("chrt_icn")); + subframe->SetIcon(wxIcon(_T("chrt_icn"))); #else subframe->SetIcon(wxIcon( mondrian_xpm )); #endif @@ -219,27 +236,33 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(MDI_NEW_WINDOW, "&New window"); - file_menu->Append(MDI_CHILD_QUIT, "&Close child", "Close this window"); - file_menu->Append(MDI_QUIT, "&Exit"); + file_menu->Append(MDI_NEW_WINDOW, _T("&New window")); + file_menu->Append(MDI_CHILD_QUIT, _T("&Close child"), _T("Close this window")); + file_menu->Append(MDI_QUIT, _T("&Exit")); wxMenu *option_menu = new wxMenu; - // Dummy option - option_menu->Append(MDI_REFRESH, "&Refresh picture"); + option_menu->Append(MDI_REFRESH, _T("&Refresh picture")); + option_menu->Append(MDI_CHANGE_TITLE, _T("Change &title...\tCtrl-T")); + option_menu->AppendSeparator(); + option_menu->Append(MDI_CHANGE_POSITION, _T("Move frame\tCtrl-M")); + option_menu->Append(MDI_CHANGE_SIZE, _T("Resize frame\tCtrl-S")); wxMenu *help_menu = new wxMenu; - help_menu->Append(MDI_ABOUT, "&About"); + help_menu->Append(MDI_ABOUT, _T("&About")); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); - menu_bar->Append(option_menu, "&Options"); - menu_bar->Append(help_menu, "&Help"); + menu_bar->Append(file_menu, _T("&File")); + menu_bar->Append(option_menu, _T("&Child")); + menu_bar->Append(help_menu, _T("&Help")); // Associate the menu bar with the frame subframe->SetMenuBar(menu_bar); + subframe->CreateStatusBar(); + subframe->SetStatusText(title); + int width, height; subframe->GetClientSize(&width, &height); MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height)); @@ -249,35 +272,36 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) // Give it scrollbars canvas->SetScrollbars(20, 20, 50, 50); - subframe->CreateStatusBar(); - subframe->SetStatusText(title); - - subframe->Show(TRUE); + subframe->Show(true); } -void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event) ) +void MyFrame::OnSize(wxSizeEvent& + #ifdef __WXUNIVERSAL__ + event + #else + WXUNUSED(event) + #endif + ) { int w, h; GetClientSize(&w, &h); textWindow->SetSize(0, 0, 200, h); GetClientWindow()->SetSize(200, 0, w - 200, h); + + // FIXME: On wxX11, we need the MDI frame to process this + // event, but on other platforms this should not + // be done. +#ifdef __WXUNIVERSAL__ + event.Skip(); +#endif } +#if wxUSE_TOOLBAR void MyFrame::InitToolBar(wxToolBar* toolBar) { wxBitmap* bitmaps[8]; -#ifdef __WXMSW__ - bitmaps[0] = new wxBitmap("icon1", wxBITMAP_TYPE_RESOURCE); - bitmaps[1] = new wxBitmap("icon2", wxBITMAP_TYPE_RESOURCE); - bitmaps[2] = new wxBitmap("icon3", wxBITMAP_TYPE_RESOURCE); - bitmaps[3] = new wxBitmap("icon4", wxBITMAP_TYPE_RESOURCE); - bitmaps[4] = new wxBitmap("icon5", wxBITMAP_TYPE_RESOURCE); - bitmaps[5] = new wxBitmap("icon6", wxBITMAP_TYPE_RESOURCE); - bitmaps[6] = new wxBitmap("icon7", wxBITMAP_TYPE_RESOURCE); - bitmaps[7] = new wxBitmap("icon8", wxBITMAP_TYPE_RESOURCE); -#else bitmaps[0] = new wxBitmap( new_xpm ); bitmaps[1] = new wxBitmap( open_xpm ); bitmaps[2] = new wxBitmap( save_xpm ); @@ -286,33 +310,28 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) bitmaps[5] = new wxBitmap( paste_xpm ); bitmaps[6] = new wxBitmap( print_xpm ); bitmaps[7] = new wxBitmap( help_xpm ); -#endif -#ifdef __WXMSW__ int width = 24; -#else - int width = 16; -#endif int currentX = 5; - toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file"); + toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("New file")); currentX += width + 5; - toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file"); + toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Open file")); currentX += width + 5; - toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Save file"); + toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Save file")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Copy"); + toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Copy")); currentX += width + 5; - toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Cut"); + toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Cut")); currentX += width + 5; - toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Paste"); + toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Paste")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Print"); + toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, false, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Print")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help"); + toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, true, currentX, wxDefaultPosition.y, (wxObject *) NULL, _T("Help")); toolBar->Realize(); @@ -320,6 +339,7 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) for (i = 0; i < 8; i++) delete bitmaps[i]; } +#endif // wxUSE_TOOLBAR // --------------------------------------------------------------------------- // MyCanvas @@ -327,12 +347,14 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) // Define a constructor for my canvas MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size) - : wxScrolledWindow(parent, -1, pos, size, - wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL) + : wxScrolledWindow(parent, wxID_ANY, pos, size, + wxSUNKEN_BORDER | + wxNO_FULL_REPAINT_ON_RESIZE | + wxVSCROLL | wxHSCROLL) { - SetBackgroundColour(wxColour("WHITE")); + SetBackgroundColour(wxColour(_T("WHITE"))); - m_dirty = FALSE; + m_dirty = false; } // Define the repainting behaviour @@ -349,9 +371,11 @@ void MyCanvas::OnDraw(wxDC& dc) dc.DrawRoundedRectangle(150, 150, 100, 50, 20); dc.DrawEllipse(250, 250, 100, 50); +#if wxUSE_SPLINES dc.DrawSpline(50, 200, 50, 100, 200, 10); +#endif // wxUSE_SPLINES dc.DrawLine(50, 230, 200, 230); - dc.DrawText("This is a test string", 50, 230); + dc.DrawText(_T("This is a test string"), 50, 230); wxPoint points[3]; points[0].x = 200; points[0].y = 300; @@ -375,7 +399,7 @@ void MyCanvas::OnEvent(wxMouseEvent& event) dc.SetPen(*wxBLACK_PEN); dc.DrawLine(xpos, ypos, pt.x, pt.y); - m_dirty = TRUE; + m_dirty = true; } xpos = pt.x; @@ -386,13 +410,15 @@ void MyCanvas::OnEvent(wxMouseEvent& event) // MyChild // --------------------------------------------------------------------------- -MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, - const wxPoint& pos, const wxSize& size, - const long style) - : wxMDIChildFrame(parent, -1, title, pos, size, style) +MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title) + : wxMDIChildFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, + wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { canvas = (MyCanvas *) NULL; my_children.Append(this); + + // this should work for MDI frames as well as for normal ones + SetSizeHints(100, 100); } MyChild::~MyChild() @@ -402,12 +428,40 @@ MyChild::~MyChild() void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); +} + +void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event)) +{ + if ( canvas ) + canvas->Refresh(); +} + +void MyChild::OnChangePosition(wxCommandEvent& WXUNUSED(event)) +{ + Move(10, 10); +} + +void MyChild::OnChangeSize(wxCommandEvent& WXUNUSED(event)) +{ + SetClientSize(100, 100); } -void MyChild::OnRefresh(wxCommandEvent& event) +void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event)) { - Refresh(); +//#if wxUSE_TEXTDLG + static wxString s_title = _T("Canvas Frame"); + + wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"), + _T("MDI sample question"), + s_title, + GetParent()->GetParent()); + if ( !title ) + return; + + s_title = title; + SetTitle(s_title); +//#endif } void MyChild::OnActivate(wxActivateEvent& event) @@ -416,11 +470,38 @@ void MyChild::OnActivate(wxActivateEvent& event) canvas->SetFocus(); } +void MyChild::OnMove(wxMoveEvent& event) +{ + // VZ: here everything is totally wrong under MSW, the positions are + // different and both wrong (pos2 is off by 2 pixels for me which seems + // to be the width of the MDI canvas border) + wxPoint pos1 = event.GetPosition(), + pos2 = GetPosition(); + wxLogStatus(wxT("position from event: (%d, %d), from frame (%d, %d)"), + pos1.x, pos1.y, pos2.x, pos2.y); + + event.Skip(); +} + +void MyChild::OnSize(wxSizeEvent& event) +{ + // VZ: under MSW the size event carries the client size (quite + // unexpectedly) *except* for the very first one which has the full + // size... what should it really be? TODO: check under wxGTK + wxSize size1 = event.GetSize(), + size2 = GetSize(), + size3 = GetClientSize(); + wxLogStatus(wxT("size from event: %dx%d, from frame %dx%d, client %dx%d"), + size1.x, size1.y, size2.x, size2.y, size3.x, size3.y); + + event.Skip(); +} + void MyChild::OnClose(wxCloseEvent& event) { if ( canvas && canvas->IsDirty() ) { - if ( wxMessageBox("Really close?", "Please confirm", + if ( wxMessageBox(_T("Really close?"), _T("Please confirm"), wxICON_QUESTION | wxYES_NO) != wxYES ) { event.Veto();