// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "wx/toolbar.h"
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if !defined(__WXMSW__)
#include "mondrian.xpm"
#endif
{
// 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, "My menu item!");
+ 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
// Make a menubar
wxMenu *file_menu = new wxMenu;
- file_menu->Append(MDI_NEW_WINDOW, "&New window\tCtrl-N", "Create a new child window");
- file_menu->Append(MDI_QUIT, "&Exit\tAlt-X", "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\tF1");
+ 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);
+#if wxUSE_STATUSBAR
frame->CreateStatusBar();
+#endif // wxUSE_STATUSBAR
- frame->Show(TRUE);
+ frame->Show(true);
SetTopWindow(frame);
- return TRUE;
+ return true;
}
// ---------------------------------------------------------------------------
: 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];
{
wxString msg;
msg.Printf(_T("%d windows still open, close anyhow?"), gs_nFrames);
- if ( wxMessageBox(msg, "Please confirm",
+ if ( wxMessageBox(msg, _T("Please confirm"),
wxICON_QUESTION | wxYES_NO) != wxYES )
{
event.Veto();
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(_T("Canvas Frame %d"), ++gs_nFrames);
// Give it an icon
#ifdef __WXMSW__
- subframe->SetIcon(wxIcon("chrt_icn"));
+ subframe->SetIcon(wxIcon(_T("chrt_icn")));
#else
subframe->SetIcon(wxIcon( mondrian_xpm ));
#endif
// 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;
- option_menu->Append(MDI_REFRESH, "&Refresh picture");
- option_menu->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T");
+ 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, "Move frame\tCtrl-M");
- option_menu->Append(MDI_CHANGE_SIZE, "Resize frame\tCtrl-S");
+ 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, "&Child");
- 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);
+#if wxUSE_STATUSBAR
subframe->CreateStatusBar();
subframe->SetStatusText(title);
+#endif // wxUSE_STATUSBAR
int width, height;
subframe->GetClientSize(&width, &height);
// Give it scrollbars
canvas->SetScrollbars(20, 20, 50, 50);
- subframe->Show(TRUE);
+ subframe->Show(true);
}
-void MyFrame::OnSize(wxSizeEvent& event)
+void MyFrame::OnSize(wxSizeEvent&
+ #ifdef __WXUNIVERSAL__
+ event
+ #else
+ WXUNUSED(event)
+ #endif
+ )
{
int w, h;
GetClientSize(&w, &h);
// FIXME: On wxX11, we need the MDI frame to process this
// event, but on other platforms this should not
// be done.
-#ifdef __WXX11__
+#ifdef __WXUNIVERSAL__
event.Skip();
#endif
}
+#if wxUSE_TOOLBAR
void MyFrame::InitToolBar(wxToolBar* toolBar)
{
wxBitmap* bitmaps[8];
int width = 24;
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, wxDefaultCoord, (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, wxDefaultCoord, (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, wxDefaultCoord, (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, wxDefaultCoord, (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, wxDefaultCoord, (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, wxDefaultCoord, (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, wxDefaultCoord, (wxObject *) NULL, _T("Print"));
currentX += width + 5;
toolBar->AddSeparator();
- toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help");
+ toolBar->AddTool( MDI_ABOUT, *bitmaps[7], wxNullBitmap, true, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Help"));
toolBar->Realize();
for (i = 0; i < 8; i++)
delete bitmaps[i];
}
+#endif // wxUSE_TOOLBAR
// ---------------------------------------------------------------------------
// MyCanvas
// Define a constructor for my canvas
MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
- : wxScrolledWindow(parent, -1, pos, size,
+ : 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
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;
dc.SetPen(*wxBLACK_PEN);
dc.DrawLine(xpos, ypos, pt.x, pt.y);
- m_dirty = TRUE;
+ m_dirty = true;
}
xpos = pt.x;
// MyChild
// ---------------------------------------------------------------------------
-MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
- const wxPoint& pos, const wxSize& size,
- const long style)
- : wxMDIChildFrame(parent, -1, title, pos, size,
- style | wxNO_FULL_REPAINT_ON_RESIZE)
+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);
void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- Close(TRUE);
+ Close(true);
}
void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
{
+//#if wxUSE_TEXTDLG
static wxString s_title = _T("Canvas Frame");
wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"),
s_title = title;
SetTitle(s_title);
+//#endif
}
void MyChild::OnActivate(wxActivateEvent& 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();
projects / wxWidgets.git / blobdiff