X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12fd305bcdc9285f1d2e7369ec259dce492e61af..9696657f22ee2f10017c0bc305ae1843ee8fe768:/samples/artprov/arttest.cpp diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp index 0c8ae43d8e..29fda747de 100644 --- a/samples/artprov/arttest.cpp +++ b/samples/artprov/arttest.cpp @@ -6,7 +6,7 @@ // Created: 2002/03/25 // RCS-ID: $Id$ // Copyright: (c) Vaclav Slavik -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -20,11 +20,12 @@ #include "wx/wx.h" #endif -#ifndef __WXMSW__ - #include "mondrian.xpm" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" #endif #include "wx/artprov.h" +#include "artbrows.h" // ---------------------------------------------------------------------------- // private classes @@ -46,7 +47,11 @@ private: // event handlers (these functions should _not_ be virtual) void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); +#if wxUSE_LOG void OnLogs(wxCommandEvent& event); +#endif // wxUSE_LOG + void OnBrowser(wxCommandEvent& event); + void OnPlugProvider(wxCommandEvent& event); DECLARE_EVENT_TABLE() }; @@ -58,18 +63,24 @@ private: // IDs for the controls and the menu commands enum { - ID_Quit = wxID_HIGHEST, - ID_Logs + ID_Quit = wxID_EXIT, + ID_Logs = wxID_HIGHEST+1, + ID_Browser, + ID_PlugProvider }; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(ID_Quit, MyFrame::OnQuit) - EVT_MENU(ID_Logs, MyFrame::OnLogs) - EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) + EVT_MENU(ID_Quit, MyFrame::OnQuit) +#if wxUSE_LOG + EVT_MENU(ID_Logs, MyFrame::OnLogs) +#endif // wxUSE_LOG + EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) + EVT_MENU(ID_Browser, MyFrame::OnBrowser) + EVT_MENU(ID_PlugProvider, MyFrame::OnPlugProvider) END_EVENT_TABLE() IMPLEMENT_APP(MyApp) @@ -85,39 +96,84 @@ IMPLEMENT_APP(MyApp) // 'Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // create the main application window - MyFrame *frame = new MyFrame(_T("wxArtProvider sample"), + MyFrame *frame = new MyFrame(wxT("wxArtProvider sample"), wxPoint(50, 50), wxSize(450, 340)); - frame->Show(TRUE); - return TRUE; + frame->Show(true); + return true; +} + +// ---------------------------------------------------------------------------- +// custom art provider +// ---------------------------------------------------------------------------- + +class MyArtProvider : public wxArtProvider +{ +protected: + virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, + const wxSize& size); +}; + +#include "info.xpm" +#include "error.xpm" +#include "warning.xpm" +#include "question.xpm" + +wxBitmap MyArtProvider::CreateBitmap(const wxArtID& id, + const wxArtClient& client, + const wxSize& WXUNUSED(size)) +{ + if ( client == wxART_MESSAGE_BOX ) + { + if ( id == wxART_INFORMATION ) + return wxBitmap(info_xpm); + if ( id == wxART_ERROR ) + return wxBitmap(error_xpm); + if ( id == wxART_WARNING ) + return wxBitmap(warning_xpm); + if ( id == wxART_QUESTION ) + return wxBitmap(question_xpm); + } + return wxNullBitmap; } + + // ---------------------------------------------------------------------------- // main frame // ---------------------------------------------------------------------------- // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style) - : wxFrame(NULL, -1, title, pos, size, style) + : wxFrame(NULL, wxID_ANY, title, pos, size, style) { - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); // create a menu bar wxMenu *menuFile = new wxMenu; // the "About" item should be in the help menu wxMenu *helpMenu = new wxMenu; - helpMenu->Append(wxID_ABOUT, _T("&About...\tF1"), _T("Show about dialog")); + helpMenu->Append(wxID_ABOUT, wxT("&About\tF1"), wxT("Show about dialog")); + + menuFile->AppendCheckItem(ID_PlugProvider, wxT("&Plug-in art provider"), wxT("Enable custom art provider")); + menuFile->AppendSeparator(); - menuFile->Append(ID_Logs, _T("&Logging test"), _T("Show some logging output")); +#if wxUSE_LOG + menuFile->Append(ID_Logs, wxT("&Logging test"), wxT("Show some logging output")); +#endif // wxUSE_LOG + menuFile->Append(ID_Browser, wxT("&Resources browser"), wxT("Browse all available icons")); menuFile->AppendSeparator(); - - menuFile->Append(ID_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); + + menuFile->Append(ID_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar(); - menuBar->Append(menuFile, _T("&File")); - menuBar->Append(helpMenu, _T("&Help")); + menuBar->Append(menuFile, wxT("&File")); + menuBar->Append(helpMenu, wxT("&Help")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); @@ -128,25 +184,42 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } +#if wxUSE_LOG void MyFrame::OnLogs(wxCommandEvent& WXUNUSED(event)) { - wxLogMessage(_T("Some information.")); - wxLogError(_T("This is an error.")); - wxLogWarning(_T("A warning.")); - wxLogError(_T("Yet another error.")); + wxLogMessage(wxT("Some information.")); + wxLogError(wxT("This is an error.")); + wxLogWarning(wxT("A warning.")); + wxLogError(wxT("Yet another error.")); wxLog::GetActiveTarget()->Flush(); - wxLogMessage(_T("Check/uncheck 'File/Plug-in provider' and try again.")); + wxLogMessage(wxT("Check/uncheck 'File/Plug-in art provider' and try again.")); } +#endif // wxUSE_LOG void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString msg; - msg.Printf( _T("This is the about dialog of wxArtProvider sample.\n") - _T("Welcome to %s"), wxVERSION_STRING); + msg.Printf( wxT("This is the about dialog of wxArtProvider sample.\n") + wxT("Welcome to %s"), wxVERSION_STRING); - wxMessageBox(msg, _T("About Minimal"), wxOK | wxICON_INFORMATION, this); + wxMessageBox(msg, wxT("About wxArtProvider sample"), + wxOK | wxICON_INFORMATION, this); +} + +void MyFrame::OnBrowser(wxCommandEvent& WXUNUSED(event)) +{ + wxArtBrowserDialog dlg(this); + dlg.ShowModal(); +} + +void MyFrame::OnPlugProvider(wxCommandEvent& event) +{ + if ( event.IsChecked() ) + wxArtProvider::Push(new MyArtProvider); + else + wxArtProvider::Pop(); }