X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ef76992c86daff306a62042d9467e118c36cf1f..87419e97c6f15a9906de69690e7ba59ec0ffd119:/samples/ownerdrw/ownerdrw.cpp diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp index 651aedcccc..10db9ced6d 100644 --- a/samples/ownerdrw/ownerdrw.cpp +++ b/samples/ownerdrw/ownerdrw.cpp @@ -2,7 +2,7 @@ // Name: ownerdrw.cpp // Purpose: Owner-draw sample, for Windows // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 13.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -26,7 +26,7 @@ #include "wx/ownerdrw.h" #include "wx/menuitem.h" -#include "wx/msw/checklst.h" +#include "wx/checklst.h" // Define a new application type class OwnerDrawnApp: public wxApp @@ -40,8 +40,8 @@ class OwnerDrawnFrame : public wxFrame { public: // ctor & dtor - OwnerDrawnFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h); - ~OwnerDrawnFrame(); + OwnerDrawnFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h); + ~OwnerDrawnFrame(){}; // notifications void OnQuit (wxCommandEvent& event); @@ -50,7 +50,7 @@ public: void OnListboxSelect (wxCommandEvent& event); void OnCheckboxToggle (wxCommandEvent& event); void OnListboxDblClick (wxCommandEvent& event); - bool OnClose () { return TRUE; } + bool OnClose () { return true; } DECLARE_EVENT_TABLE() @@ -61,12 +61,12 @@ private: wxMenuItem *pAboutItem; }; -enum +enum { - Menu_Quit = 1, + Menu_Quit = 1, Menu_First = 100, - Menu_Test1, Menu_Test2, Menu_Test3, - Menu_Bitmap, Menu_Bitmap2, + Menu_Test1, Menu_Test2, Menu_Test3, + Menu_Bitmap, Menu_Bitmap2, Menu_Submenu, Menu_Sub1, Menu_Sub2, Menu_Sub3, Menu_Toggle, Menu_About, Control_First = 1000, @@ -79,7 +79,7 @@ BEGIN_EVENT_TABLE(OwnerDrawnFrame, wxFrame) EVT_MENU(Menu_Quit, OwnerDrawnFrame::OnQuit) EVT_LISTBOX(Control_Listbox, OwnerDrawnFrame::OnListboxSelect) EVT_CHECKLISTBOX(Control_Listbox, OwnerDrawnFrame::OnCheckboxToggle) - EVT_COMMAND(Control_Listbox, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, + EVT_COMMAND(Control_Listbox, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, OwnerDrawnFrame::OnListboxDblClick) END_EVENT_TABLE() @@ -89,28 +89,30 @@ IMPLEMENT_APP(OwnerDrawnApp); bool OwnerDrawnApp::OnInit(void) { OwnerDrawnFrame *pFrame - = new OwnerDrawnFrame(NULL, _T("wxWindows Ownerdraw Sample"), + = new OwnerDrawnFrame(NULL, _T("wxWidgets Ownerdraw Sample"), 50, 50, 450, 340); SetTopWindow(pFrame); - return TRUE; + return true; } // create the menu bar for the main frame void OwnerDrawnFrame::InitMenu() { // Make a menubar - wxMenu *file_menu = new wxMenu, - *sub_menu = new wxMenu; + wxMenuItem *pItem; + wxMenu *file_menu = new wxMenu; + +#ifndef __WXUNIVERSAL__ + wxMenu *sub_menu = new wxMenu; // vars used for menu construction - wxMenuItem *pItem; - wxFont fontLarge(18, wxROMAN, wxNORMAL, wxBOLD, FALSE), - fontUlined(12, wxDEFAULT, wxNORMAL, wxNORMAL, TRUE), - fontItalic(12, wxMODERN, wxITALIC, wxBOLD, FALSE), + wxFont fontLarge(18, wxROMAN, wxNORMAL, wxBOLD, false), + fontUlined(12, wxDEFAULT, wxNORMAL, wxNORMAL, true), + fontItalic(12, wxMODERN, wxITALIC, wxBOLD, false), // should be at least of the size of bitmaps - fontBmp(14, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE); + fontBmp(14, wxDEFAULT, wxNORMAL, wxNORMAL, false); // sorry for my artistic skills... wxBitmap bmpBell(_T("bell")), @@ -139,19 +141,18 @@ void OwnerDrawnFrame::InitMenu() pItem = new wxMenuItem(file_menu, Menu_Test1, _T("&Uncheckable"), _T("red item")); pItem->SetFont(*wxITALIC_FONT); pItem->SetTextColour(wxColor(255, 0, 0)); - pItem->SetMarginWidth(23); file_menu->Append(pItem); pItem = new wxMenuItem(file_menu, Menu_Test2, _T("&Checkable"), _T("checkable item"), wxITEM_CHECK); pItem->SetFont(*wxSMALL_FONT); file_menu->Append(pItem); - file_menu->Check(Menu_Test2, TRUE); + file_menu->Check(Menu_Test2, true); pItem = new wxMenuItem(file_menu, Menu_Test3, _T("&Disabled"), _T("disabled item")); pItem->SetFont(*wxNORMAL_FONT); file_menu->Append(pItem); - file_menu->Enable(Menu_Test3, FALSE); + file_menu->Enable(Menu_Test3, false); file_menu->AppendSeparator(); @@ -175,19 +176,21 @@ void OwnerDrawnFrame::InitMenu() file_menu->Append(pItem); file_menu->AppendSeparator(); - pItem = new wxMenuItem(file_menu, Menu_Toggle, _T("&Disable/Enable\tCtrl+D"), + pItem = new wxMenuItem(file_menu, Menu_Toggle, _T("&Disable/Enable\tCtrl+D"), _T("enables/disables the About-Item"), wxITEM_NORMAL); pItem->SetFont(*wxNORMAL_FONT); file_menu->Append(pItem); // Of course Ctrl+RatherLongAccel will not work in this example: - pAboutItem = new wxMenuItem(file_menu, Menu_About, _T("&About\tCtrl+RatherLongAccel"), + pAboutItem = new wxMenuItem(file_menu, Menu_About, _T("&About\tCtrl+RatherLongAccel"), _T("display program information"), wxITEM_NORMAL); pAboutItem->SetBitmap(bmpInfo); pAboutItem->SetDisabledBitmap(bmpInfo_mono); file_menu->Append(pAboutItem); file_menu->AppendSeparator(); +#endif + pItem = new wxMenuItem(file_menu, Menu_Quit, _T("&Quit"), _T("Normal item"), wxITEM_NORMAL); file_menu->Append(pItem); @@ -199,9 +202,9 @@ void OwnerDrawnFrame::InitMenu() } // main frame constructor -OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, wxChar *title, +OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h) - : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) + : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)) { // set the icon SetIcon(wxIcon(_T("mondrian"))); @@ -209,18 +212,19 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, wxChar *title, // create the menu InitMenu(); +#if wxUSE_STATUSBAR // create the status line const int widths[] = { -1, 60 }; CreateStatusBar(2); SetStatusWidths(2, widths); SetStatusText(_T("no selection"), 0); +#endif // wxUSE_STATUSBAR // make a panel with some controls - wxPanel *pPanel = new wxPanel(this, -1, wxPoint(0, 0), - wxSize(400, 200), wxTAB_TRAVERSAL); + wxPanel *pPanel = new wxPanel(this); // check list box - static const wxChar* aszChoices[] = { _T("Hello"), _T("world"), _T("and"), + static const wxChar* aszChoices[] = { _T("Hello"), _T("world"), _T("and"), _T("goodbye"), _T("cruel"), _T("world"), _T("-------"), _T("owner-drawn"), _T("listbox") }; @@ -243,21 +247,17 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, wxChar *title, for ( ui = 0; ui < WXSIZEOF(aszChoices); ui += 2 ) { +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) m_pListBox->GetItem(ui)->SetBackgroundColour(wxColor(200, 200, 200)); +#endif } m_pListBox->Check(2); // normal (but owner-drawn) listbox static const wxChar* aszColors[] = { _T("Red"), _T("Blue"), _T("Pink"), - _T("Green"), _T("Yellow"), + _T("Green"), _T("Yellow"), _T("Black"), _T("Violet") }; - struct { unsigned int r, g, b; } aColors[] = - { - {255,0,0}, {0,0,255}, {255,128,192}, - {0,255,0}, {255,255,128}, - {0,0,0}, {128,0,255} - }; astrChoices = new wxString[WXSIZEOF(aszColors)]; @@ -271,39 +271,45 @@ OwnerDrawnFrame::OwnerDrawnFrame(wxFrame *frame, wxChar *title, pPanel, // parent Control_Listbox2, // control id wxPoint(220, 10), // listbox position - wxDefaultSize, // listbox size - WXSIZEOF(aszColors), // number of strings + wxSize(200, 200), // listbox size + WXSIZEOF(aszColors), // number of strings astrChoices, // array of strings - wxLB_OWNERDRAW, // owner-drawn - wxDefaultValidator, // - wxListBoxNameStr + wxLB_OWNERDRAW // owner-drawn ); +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + + struct { unsigned char r, g, b; } aColors[] = + { + {255,0,0}, {0,0,255}, {255,128,192}, + {0,255,0}, {255,255,128}, + {0,0,0}, {128,0,255} + }; + for ( ui = 0; ui < WXSIZEOF(aszColors); ui++ ) { pListBox->GetItem(ui)->SetTextColour(wxColor(aColors[ui].r, - aColors[ui].g, + aColors[ui].g, aColors[ui].b)); // yellow on white is horrible... if ( ui == 4 ) { pListBox->GetItem(ui)->SetBackgroundColour(wxColor(0, 0, 0)); } - } - delete[] astrChoices; +#else + wxUnusedVar( pListBox ); +#endif - Show(TRUE); -} + delete[] astrChoices; -OwnerDrawnFrame::~OwnerDrawnFrame() -{ + Show(true); } void OwnerDrawnFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } void OwnerDrawnFrame::OnMenuToggle(wxCommandEvent& WXUNUSED(event)) @@ -311,7 +317,7 @@ void OwnerDrawnFrame::OnMenuToggle(wxCommandEvent& WXUNUSED(event)) // This example shows the use of bitmaps in ownerdrawn menuitems and is not a good // example on how to enable and disable menuitems - this should be done with the help of // EVT_UPDATE_UI and EVT_UPDATE_UI_RANGE ! - pAboutItem->Enable( pAboutItem->IsEnabled() ? FALSE : TRUE ); + pAboutItem->Enable( pAboutItem->IsEnabled() ? false : true ); } void OwnerDrawnFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) @@ -324,11 +330,15 @@ void OwnerDrawnFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void OwnerDrawnFrame::OnListboxSelect(wxCommandEvent& event) { +#if wxUSE_STATUSBAR wxString strSelection; unsigned int nSel = event.GetSelection(); strSelection.Printf(wxT("item %d selected (%schecked)"), nSel, m_pListBox->IsChecked(nSel) ? wxT("") : wxT("not ")); SetStatusText(strSelection); +#else + wxUnusedVar(event); +#endif // wxUSE_STATUSBAR } void OwnerDrawnFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event)) @@ -342,9 +352,13 @@ void OwnerDrawnFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event)) void OwnerDrawnFrame::OnCheckboxToggle(wxCommandEvent& event) { +#if wxUSE_STATUSBAR wxString strSelection; unsigned int nItem = event.GetInt(); strSelection.Printf(wxT("item %d was %schecked"), nItem, m_pListBox->IsChecked(nItem) ? wxT("") : wxT("un")); SetStatusText(strSelection); +#else + wxUnusedVar(event); +#endif // wxUSE_STATUSBAR }