Make a couple virtuals protected so they can be overridden.

[wxWidgets.git] / samples / taskbar / tbtest.cpp

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index 5bc61d1a25b79b8723d4318b3a3acb43b6a92d0d..f5f831266627e36358026fd7f5ad9d29f586341d 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -2,13 +2,21 @@
 // Name:        tbtest.cpp
 // Purpose:     wxTaskBarIcon demo
 // Author:      Julian Smart
 // Name:        tbtest.cpp
 // Purpose:     wxTaskBarIcon demo
 // Author:      Julian Smart

-// Modified by: Ryan Norton (Drawer)
+// Modified by:

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -17,11 +25,11 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/wx.h"

 #endif
 
 // the application icon (under Windows and OS/2 it is in resources)
 #endif
 
 // the application icon (under Windows and OS/2 it is in resources)

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -29,75 +37,137 @@
 
 #include "wx/taskbar.h"
 
 
 #include "wx/taskbar.h"
 

-#if defined(__WXMAC__)
-#include "wx/mac/private.h"
-#endif
-
-//include this sample's header

 #include "tbtest.h"
 
 #include "tbtest.h"
 

+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------

 
 

-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+static MyDialog *gs_dialog = NULL;

 
 

-//drawer
-#include "wx/dcclient.h"
-#include "wx/mac/carbon/drawer.h"
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-class MyDrawer : public wxDrawerWindow
-{
-    public:
-    MyDrawer(wxWindow* p) : wxDrawerWindow(p, wxID_ANY, wxT(""), wxSize(200,200)) 
-    {  }
-    
-    void OnPaint(wxPaintEvent&)
-    {
-        wxPaintDC dc(this);
-        dc.DrawRectangle(30,30,60,60);
-    }
-    
-       DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(MyDrawer, wxDrawerWindow)
-    EVT_PAINT(MyDrawer::OnPaint)
-END_EVENT_TABLE()
-
-#endif 
-    //OSX 10.2+
-    
-MyDialog   *dialog = NULL;
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

-bool MyApp::OnInit(void)
+bool MyApp::OnInit()

 {
 {

-    // Create the main frame window
-    dialog = new MyDialog(NULL, wxID_ANY, wxT("wxTaskBarIcon Test Dialog"), wxDefaultPosition, wxSize(365, 290));
+    if ( !wxApp::OnInit() )
+        return false;
+
+    if ( !wxTaskBarIcon::IsAvailable() )
+    {
+        wxMessageBox
+        (
+            "There appears to be no system tray support in your current environment. This sample may not behave as expected.",
+            "Warning",
+            wxOK | wxICON_EXCLAMATION
+        );
+    }
+
+    // Create the main window
+    gs_dialog = new MyDialog(wxT("wxTaskBarIcon Test Dialog"));

 
 

-    dialog->Show(true);
+    gs_dialog->Show(true);

 
     return true;
 }
 
 
 
     return true;
 }
 
 

+// ----------------------------------------------------------------------------
+// MyDialog implementation
+// ----------------------------------------------------------------------------
+

 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
 BEGIN_EVENT_TABLE(MyDialog, wxDialog)

+    EVT_BUTTON(wxID_ABOUT, MyDialog::OnAbout)

     EVT_BUTTON(wxID_OK, MyDialog::OnOK)
     EVT_BUTTON(wxID_EXIT, MyDialog::OnExit)
     EVT_CLOSE(MyDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
 
     EVT_BUTTON(wxID_OK, MyDialog::OnOK)
     EVT_BUTTON(wxID_EXIT, MyDialog::OnExit)
     EVT_CLOSE(MyDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
 

-
-MyDialog::MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
-    const wxPoint& pos, const wxSize& size, const long windowStyle):
-  wxDialog(parent, id, title, pos, size, windowStyle)
+MyDialog::MyDialog(const wxString& title)
+        : wxDialog(NULL, wxID_ANY, title)

 {
 {

-    Init();
+    wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
+
+    wxSizerFlags flags;
+    flags.Border(wxALL, 10);
+
+    sizerTop->Add(new wxStaticText
+                      (
+                        this,
+                        wxID_ANY,
+                        wxT("Press 'Hide me' to hide this window, Exit to quit.")
+                      ), flags);
+
+    sizerTop->Add(new wxStaticText
+                      (
+                        this,
+                        wxID_ANY,
+                        wxT("Double-click on the taskbar icon to show me again.")
+                      ), flags);
+
+    sizerTop->AddStretchSpacer()->SetMinSize(200, 50);
+
+    wxSizer * const sizerBtns = new wxBoxSizer(wxHORIZONTAL);
+    sizerBtns->Add(new wxButton(this, wxID_ABOUT, wxT("&About")), flags);
+    sizerBtns->Add(new wxButton(this, wxID_OK, wxT("&Hide")), flags);
+    sizerBtns->Add(new wxButton(this, wxID_EXIT, wxT("E&xit")), flags);
+
+    sizerTop->Add(sizerBtns, flags.Align(wxALIGN_CENTER_HORIZONTAL));
+    SetSizerAndFit(sizerTop);
+    Centre();
+
+    m_taskBarIcon = new MyTaskBarIcon();
+
+    // we should be able to show up to 128 characters on recent Windows versions
+    // (and 64 on Win9x)
+    if ( !m_taskBarIcon->SetIcon(wxICON(sample),
+                                 "wxTaskBarIcon Sample\n"
+                                 "With a very, very, very, very\n"
+                                 "long tooltip whose length is\n"
+                                 "greater than 64 characters.") )
+    {
+        wxLogError(wxT("Could not set icon."));
+    }
+
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
+    m_dockIcon = new MyTaskBarIcon(wxTaskBarIcon::DOCK);
+    if ( !m_dockIcon->SetIcon(wxICON(sample)) )
+    {
+        wxLogError(wxT("Could not set icon."));
+    }
+#endif

 }
 
 MyDialog::~MyDialog()
 {
     delete m_taskBarIcon;
 }
 
 MyDialog::~MyDialog()
 {
     delete m_taskBarIcon;

+#if defined(__WXCOCOA__)
+    delete m_dockIcon;
+#endif
+}
+
+void MyDialog::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    static const char * const title = "About wxWidgets Taskbar Sample";
+    static const char * const message
+        = "wxWidgets sample showing wxTaskBarIcon class\n"
+          "\n"
+          "(C) 1997 Julian Smart\n"
+          "(C) 2007 Vadim Zeitlin";
+
+#if defined(__WXMSW__) && wxUSE_TASKBARICON_BALLOONS
+    m_taskBarIcon->ShowBalloon(title, message, 15000, wxICON_INFORMATION);
+#else // !__WXMSW__
+    wxMessageBox(message, title, wxICON_INFORMATION|wxOK, this);
+#endif // __WXMSW__/!__WXMSW__

 }
 
 void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))


@@ -115,51 +185,20 @@ void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     Destroy();
 }
 
     Destroy();
 }
 

-void MyDialog::Init(void)
-{
-  (void)new wxStaticText(this, wxID_ANY, _T("Press 'Hide me' to hide me, Exit to quit."),
-                         wxPoint(10, 20));
-
-  (void)new wxStaticText(this, wxID_ANY, _T("Double-click on the taskbar icon to show me again."),
-                         wxPoint(10, 40));
-
-  (void)new wxButton(this, wxID_EXIT, _T("Exit"), wxPoint(185, 230), wxSize(80, 25));
-  (new wxButton(this, wxID_OK, _T("Hide me"), wxPoint(100, 230), wxSize(80, 25)))->SetDefault();
-  Centre(wxBOTH);
-   
-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
-
-    MacSetMetalAppearance(true);
-    Show(TRUE);
- 
-    MyDrawer* pMyDrawer = new MyDrawer(this);
-    pMyDrawer->Open(true);
-   
-    m_taskBarIcon = new MyTaskBarIcon(pMyDrawer);    
-#else
-    m_taskBarIcon = new MyTaskBarIcon();
-#endif
-    
-    if (!m_taskBarIcon->SetIcon(wxICON(sample), wxT("wxTaskBarIcon Sample")))
-        wxMessageBox(wxT("Could not set icon."));
-}

 
 

+// ----------------------------------------------------------------------------
+// MyTaskBarIcon implementation
+// ----------------------------------------------------------------------------

 
 

-enum {
+enum
+{

     PU_RESTORE = 10001,
     PU_RESTORE = 10001,

-    

     PU_NEW_ICON,
     PU_NEW_ICON,

-    PU_OLD_ICON,
-    
-    PU_OPEN_DRAWER,
-    PU_CLOSE_DRAWER,
-    
-    PU_LEFT_DRAWER,
-    PU_RIGHT_DRAWER,
-    PU_TOP_DRAWER,
-    PU_BOTTOM_DRAWER,
-    

     PU_EXIT,
     PU_EXIT,

+    PU_CHECKMARK,
+    PU_SUB1,
+    PU_SUB2,
+    PU_SUBMAIN

 };
 
 
 };
 
 


@@ -167,100 +206,75 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
     EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
     EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)

-    EVT_MENU(PU_OLD_ICON,MyTaskBarIcon::OnMenuSetOldIcon)
-    EVT_MENU(PU_OPEN_DRAWER,MyTaskBarIcon::OnMenuOpenDrawer)
-    EVT_MENU(PU_CLOSE_DRAWER,MyTaskBarIcon::OnMenuCloseDrawer)
-    EVT_MENU(PU_TOP_DRAWER,MyTaskBarIcon::OnMenuTopDrawer)
-    EVT_MENU(PU_BOTTOM_DRAWER,MyTaskBarIcon::OnMenuBottomDrawer)
-    EVT_MENU(PU_LEFT_DRAWER,MyTaskBarIcon::OnMenuLeftDrawer)
-    EVT_MENU(PU_RIGHT_DRAWER,MyTaskBarIcon::OnMenuRightDrawer)
-    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLButtonDClick)
+    EVT_MENU(PU_CHECKMARK,MyTaskBarIcon::OnMenuCheckmark)
+    EVT_UPDATE_UI(PU_CHECKMARK,MyTaskBarIcon::OnMenuUICheckmark)
+    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLeftButtonDClick)
+    EVT_MENU(PU_SUB1, MyTaskBarIcon::OnMenuSub)
+    EVT_MENU(PU_SUB2, MyTaskBarIcon::OnMenuSub)

 END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 {
 END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 {

-    dialog->Show(true);
+    gs_dialog->Show(true);

 }
 
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {
 }
 
 void MyTaskBarIcon::OnMenuExit(wxCommandEvent& )
 {

-    dialog->Close(true);
-}
-
-void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)
-{
-    wxIcon icon(smile_xpm);
-
-    if (!SetIcon(icon, wxT("wxTaskBarIcon Sample - a different icon")))
-        wxMessageBox(wxT("Could not set new icon."));
-}
-
-void MyTaskBarIcon::OnMenuSetOldIcon(wxCommandEvent&)
-{
-    wxIcon icon(wxT("wxDEFAULT_FRAME"));
-
-    if (!RemoveIcon())
-        wxMessageBox(wxT("Could not restore old icon."));
+    gs_dialog->Close(true);

 }
 
 }
 

-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+static bool check = true;

 
 

-void MyTaskBarIcon::OnMenuOpenDrawer(wxCommandEvent&)
+void MyTaskBarIcon::OnMenuCheckmark(wxCommandEvent& )

 {
 {

-    m_pMyDrawer->Open(true);
+    check = !check;

 }
 
 }
 

-void MyTaskBarIcon::OnMenuCloseDrawer(wxCommandEvent&)
+void MyTaskBarIcon::OnMenuUICheckmark(wxUpdateUIEvent &event)

 {
 {

-    m_pMyDrawer->Close();
+    event.Check(check);

 }
 
 }
 

-void MyTaskBarIcon::OnMenuLeftDrawer(wxCommandEvent&)
-{
-    m_pMyDrawer->SetPreferredEdge(wxLEFT);
-}
-
-void MyTaskBarIcon::OnMenuRightDrawer(wxCommandEvent&)
+void MyTaskBarIcon::OnMenuSetNewIcon(wxCommandEvent&)

 {
 {

-    m_pMyDrawer->SetPreferredEdge(wxRIGHT);
-}
+    wxIcon icon(smile_xpm);

 
 

-void MyTaskBarIcon::OnMenuTopDrawer(wxCommandEvent&)
-{
-    m_pMyDrawer->SetPreferredEdge(wxTOP);
+    if (!SetIcon(icon, wxT("wxTaskBarIcon Sample - a different icon")))
+        wxMessageBox(wxT("Could not set new icon."));

 }
 
 }
 

-void MyTaskBarIcon::OnMenuBottomDrawer(wxCommandEvent&)
+void MyTaskBarIcon::OnMenuSub(wxCommandEvent&)

 {
 {

-    m_pMyDrawer->SetPreferredEdge(wxBOTTOM);
+    wxMessageBox(wxT("You clicked on a submenu!"));

 }
 }

-#endif

 
 // Overridables
 wxMenu *MyTaskBarIcon::CreatePopupMenu()
 {
     wxMenu *menu = new wxMenu;
 
 // Overridables
 wxMenu *MyTaskBarIcon::CreatePopupMenu()
 {
     wxMenu *menu = new wxMenu;

-    
-    menu->Append(PU_RESTORE, _T("&Restore TBTest"));
-    menu->Append(PU_NEW_ICON,_T("&Set New Icon"));
-    menu->Append(PU_OLD_ICON,_T("&Restore Old Icon"));
-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+    menu->Append(PU_RESTORE, wxT("&Restore main window"));

     menu->AppendSeparator();
     menu->AppendSeparator();

-    menu->Append(PU_OPEN_DRAWER,_T("Open Drawer"));
-    menu->Append(PU_CLOSE_DRAWER,_T("Close Drawer"));
+    menu->Append(PU_NEW_ICON, wxT("&Set New Icon"));

     menu->AppendSeparator();
     menu->AppendSeparator();

-    menu->Append(PU_LEFT_DRAWER,_T("Set Drawer to come out on the LEFT side"));
-    menu->Append(PU_RIGHT_DRAWER,_T("Set Drawer to come out on the RIGHT side"));
-    menu->Append(PU_TOP_DRAWER,_T("Set Drawer to come out on the TOP side"));
-    menu->Append(PU_BOTTOM_DRAWER,_T("Set Drawer to come out on the BOTTOM side"));
-#else    
+    menu->AppendCheckItem(PU_CHECKMARK, wxT("Test &check mark"));

     menu->AppendSeparator();
     menu->AppendSeparator();

-    menu->Append(PU_EXIT,    _T("E&xit"));
+    wxMenu *submenu = new wxMenu;
+    submenu->Append(PU_SUB1, wxT("One submenu"));
+    submenu->AppendSeparator();
+    submenu->Append(PU_SUB2, wxT("Another submenu"));
+    menu->Append(PU_SUBMAIN, wxT("Submenu"), submenu);
+    /* OSX has built-in quit menu for the dock menu, but not for the status item */
+#ifdef __WXOSX__ 
+    if ( OSXIsStatusItem() )

 #endif
 #endif

+    {
+        menu->AppendSeparator();
+        menu->Append(PU_EXIT,    wxT("E&xit"));
+    }

     return menu;
 }
 
     return menu;
 }
 

-void MyTaskBarIcon::OnLButtonDClick(wxTaskBarIconEvent&)
+void MyTaskBarIcon::OnLeftButtonDClick(wxTaskBarIconEvent&)

 {
 {

-    dialog->Show(true);
+    gs_dialog->Show(true);

 }
 }