Fix return value of wxGenericTreeCtrl::FindItem().

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

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index ac5c80bda29ba7d76f8bba10c6235c2bf5acb9fe..f5f831266627e36358026fd7f5ad9d29f586341d 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -9,6 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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,50 +25,125 @@
 #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 "smile.xpm"
 
 #include "wx/taskbar.h"
     #include "../sample.xpm"
 #endif
 
 #include "smile.xpm"
 
 #include "wx/taskbar.h"

+

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

-// Declare two frames
-MyDialog   *dialog = NULL;
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
+static MyDialog *gs_dialog = NULL;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

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

 {
     if ( !wxApp::OnInit() )
         return false;
 
 {
     if ( !wxApp::OnInit() )
         return false;
 

-    // Create the main frame window
-    dialog = new MyDialog(NULL, wxID_ANY, wxT("wxTaskBarIcon Test Dialog"), wxDefaultPosition, wxSize(365, 290));
+    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()
 }
 
 MyDialog::~MyDialog()


@@ -71,6 +154,22 @@ MyDialog::~MyDialog()
 #endif
 }
 
 #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))
 {
     Show(false);
 void MyDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     Show(false);


@@ -86,34 +185,10 @@ 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);
-
-  m_taskBarIcon = new MyTaskBarIcon();
-#if defined(__WXCOCOA__)
-  m_dockIcon = new MyTaskBarIcon(wxTaskBarIcon::DOCK);
-#endif
-  // 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."))
-  {
-        wxMessageBox(wxT("Could not set icon."));
-  }
-}

 
 

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

 
 enum
 {
 
 enum
 {


@@ -140,12 +215,12 @@ END_EVENT_TABLE()
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 {
 
 void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
 {

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

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

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

 }
 
 static bool check = true;
 }
 
 static bool check = true;


@@ -177,25 +252,29 @@ void MyTaskBarIcon::OnMenuSub(wxCommandEvent&)
 wxMenu *MyTaskBarIcon::CreatePopupMenu()
 {
     wxMenu *menu = new wxMenu;
 wxMenu *MyTaskBarIcon::CreatePopupMenu()
 {
     wxMenu *menu = new wxMenu;

-    menu->Append(PU_RESTORE, _T("&Restore main window"));
+    menu->Append(PU_RESTORE, wxT("&Restore main window"));

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

-    menu->Append(PU_NEW_ICON, _T("&Set New Icon"));
+    menu->Append(PU_NEW_ICON, wxT("&Set New Icon"));

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

-    menu->AppendCheckItem(PU_CHECKMARK, _T("Test &check mark"));
+    menu->AppendCheckItem(PU_CHECKMARK, wxT("Test &check mark"));

     menu->AppendSeparator();
     wxMenu *submenu = new wxMenu;
     menu->AppendSeparator();
     wxMenu *submenu = new wxMenu;

-    submenu->Append(PU_SUB1, _T("One submenu"));
+    submenu->Append(PU_SUB1, wxT("One submenu"));

     submenu->AppendSeparator();
     submenu->AppendSeparator();

-    submenu->Append(PU_SUB2, _T("Another submenu"));
-    menu->Append(PU_SUBMAIN, _T("Submenu"), submenu);
-#ifndef __WXMAC_OSX__ /*Mac has built-in quit menu*/
-    menu->AppendSeparator();
-    menu->Append(PU_EXIT,    _T("E&xit"));
+    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;
 }
 
 void MyTaskBarIcon::OnLeftButtonDClick(wxTaskBarIconEvent&)
 {
     return menu;
 }
 
 void MyTaskBarIcon::OnLeftButtonDClick(wxTaskBarIconEvent&)
 {

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

 }
 }