drawer sample mods from ABX (with only one mod - _CODE Added to #define USE_DRAWER 0)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/drawer/drawertest.cpp b/samples/drawer/drawertest.cpp
index 5bc61d1a25b79b8723d4318b3a3acb43b6a92d0d..77131d4369cc1493b3cff56023ccf766818439fb 100644 (file)
--- a/samples/drawer/drawertest.cpp
+++ b/samples/drawer/drawertest.cpp
@@ -34,10 +34,10 @@
 #endif
 
 //include this sample's header
 #endif
 
 //include this sample's header

-#include "tbtest.h"
+#include "drawertest.h"

 
 
 
 

-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+#if USE_DRAWER_CODE

 
 //drawer
 #include "wx/dcclient.h"
 
 //drawer
 #include "wx/dcclient.h"


@@ -46,25 +46,24 @@
 class MyDrawer : public wxDrawerWindow
 {
     public:
 class MyDrawer : public wxDrawerWindow
 {
     public:

-    MyDrawer(wxWindow* p) : wxDrawerWindow(p, wxID_ANY, wxT(""), wxSize(200,200)) 
-    {  }
-    
+    MyDrawer(wxWindow* p) : wxDrawerWindow(p, wxID_ANY, wxT(""), wxSize(200,200))
+    { }
+

     void OnPaint(wxPaintEvent&)
     {
         wxPaintDC dc(this);
         dc.DrawRectangle(30,30,60,60);
     }
     void OnPaint(wxPaintEvent&)
     {
         wxPaintDC dc(this);
         dc.DrawRectangle(30,30,60,60);
     }

-    
-       DECLARE_EVENT_TABLE()
+
+    DECLARE_EVENT_TABLE()

 };
 
 BEGIN_EVENT_TABLE(MyDrawer, wxDrawerWindow)
     EVT_PAINT(MyDrawer::OnPaint)
 END_EVENT_TABLE()
 
 };
 
 BEGIN_EVENT_TABLE(MyDrawer, wxDrawerWindow)
     EVT_PAINT(MyDrawer::OnPaint)
 END_EVENT_TABLE()
 

-#endif 
-    //OSX 10.2+
-    
+#endif // USE_DRAWER_CODE
+

 MyDialog   *dialog = NULL;
 
 IMPLEMENT_APP(MyApp)
 MyDialog   *dialog = NULL;
 
 IMPLEMENT_APP(MyApp)


@@ -117,29 +116,70 @@ void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 void MyDialog::Init(void)
 {
 
 void MyDialog::Init(void)
 {

-  (void)new wxStaticText(this, wxID_ANY, _T("Press 'Hide me' to hide me, Exit to quit."),
-                         wxPoint(10, 20));
+    wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+    const int margin = 10;
+    sizer->Add( new wxStaticText(this,
+                                 wxID_ANY,
+                                 _T("Press 'Hide me' to hide me, Exit to quit.")
+                                ),
+                0,
+                wxALL | wxALIGN_LEFT ,
+                margin
+              );
+
+    sizer->Add( new wxStaticText(this,
+                                 wxID_ANY,
+                                 _T("Double-click on the taskbar icon to show me again.")
+                                ),
+                0,
+                wxALL | wxALIGN_LEFT ,
+                margin
+              );
+
+    wxBoxSizer *sizer_bottom = new wxBoxSizer(wxHORIZONTAL);
+
+    sizer_bottom->Add( new wxButton(this,
+                                    wxID_EXIT,
+                                    _T("Exit")
+                                   ),
+                       0,
+                       wxALL | wxALIGN_RIGHT ,
+                       margin
+                     );

 
 

-  (void)new wxStaticText(this, wxID_ANY, _T("Double-click on the taskbar icon to show me again."),
-                         wxPoint(10, 40));
+    wxButton *ok = new wxButton(this, wxID_OK, _T("Hide me"));

 
 

-  (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 )
+    sizer_bottom->Add( ok,
+                       0,
+                       wxALL | wxALIGN_LEFT ,
+                       margin
+                     );
+
+    sizer->Add( sizer_bottom, 0, wxALIGN_CENTER );
+
+    ok->SetDefault();
+
+    SetSizerAndFit(sizer);
+
+    Centre(wxBOTH);
+
+#if USE_DRAWER_CODE

 
     MacSetMetalAppearance(true);
     Show(TRUE);
 
     MacSetMetalAppearance(true);
     Show(TRUE);

- 
+

     MyDrawer* pMyDrawer = new MyDrawer(this);
     pMyDrawer->Open(true);
     MyDrawer* pMyDrawer = new MyDrawer(this);
     pMyDrawer->Open(true);

-   
-    m_taskBarIcon = new MyTaskBarIcon(pMyDrawer);    
+
+    m_taskBarIcon = new MyTaskBarIcon(pMyDrawer);
+

 #else
 #else

+

     m_taskBarIcon = new MyTaskBarIcon();
     m_taskBarIcon = new MyTaskBarIcon();

-#endif
-    
+
+#endif // USE_DRAWER_CODE/!USE_DRAWER_CODE
+

     if (!m_taskBarIcon->SetIcon(wxICON(sample), wxT("wxTaskBarIcon Sample")))
         wxMessageBox(wxT("Could not set icon."));
 }
     if (!m_taskBarIcon->SetIcon(wxICON(sample), wxT("wxTaskBarIcon Sample")))
         wxMessageBox(wxT("Could not set icon."));
 }


@@ -147,18 +187,18 @@ void MyDialog::Init(void)
 
 enum {
     PU_RESTORE = 10001,
 
 enum {
     PU_RESTORE = 10001,

-    
+

     PU_NEW_ICON,
     PU_OLD_ICON,
     PU_NEW_ICON,
     PU_OLD_ICON,

-    
+

     PU_OPEN_DRAWER,
     PU_CLOSE_DRAWER,
     PU_OPEN_DRAWER,
     PU_CLOSE_DRAWER,

-    
+

     PU_LEFT_DRAWER,
     PU_RIGHT_DRAWER,
     PU_TOP_DRAWER,
     PU_BOTTOM_DRAWER,
     PU_LEFT_DRAWER,
     PU_RIGHT_DRAWER,
     PU_TOP_DRAWER,
     PU_BOTTOM_DRAWER,

-    
+

     PU_EXIT,
 };
 
     PU_EXIT,
 };
 


@@ -168,13 +208,15 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
     EVT_MENU(PU_OLD_ICON,MyTaskBarIcon::OnMenuSetOldIcon)
     EVT_MENU(PU_EXIT,    MyTaskBarIcon::OnMenuExit)
     EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
     EVT_MENU(PU_OLD_ICON,MyTaskBarIcon::OnMenuSetOldIcon)

+#if USE_DRAWER_CODE

     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_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)
+#endif // USE_DRAWER_CODE
+    EVT_TASKBAR_LEFT_DCLICK  (MyTaskBarIcon::OnLeftButtonDClick)

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


@@ -203,7 +245,7 @@ void MyTaskBarIcon::OnMenuSetOldIcon(wxCommandEvent&)
         wxMessageBox(wxT("Could not restore old icon."));
 }
 
         wxMessageBox(wxT("Could not restore old icon."));
 }
 

-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+#if USE_DRAWER_CODE

 
 void MyTaskBarIcon::OnMenuOpenDrawer(wxCommandEvent&)
 {
 
 void MyTaskBarIcon::OnMenuOpenDrawer(wxCommandEvent&)
 {


@@ -234,17 +276,18 @@ void MyTaskBarIcon::OnMenuBottomDrawer(wxCommandEvent&)
 {
     m_pMyDrawer->SetPreferredEdge(wxBOTTOM);
 }
 {
     m_pMyDrawer->SetPreferredEdge(wxBOTTOM);
 }

-#endif
+
+#endif // USE_DRAWER_CODE

 
 // 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"));
     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 )
+#if USE_DRAWER_CODE

     menu->AppendSeparator();
     menu->Append(PU_OPEN_DRAWER,_T("Open Drawer"));
     menu->Append(PU_CLOSE_DRAWER,_T("Close Drawer"));
     menu->AppendSeparator();
     menu->Append(PU_OPEN_DRAWER,_T("Open Drawer"));
     menu->Append(PU_CLOSE_DRAWER,_T("Close Drawer"));


@@ -253,14 +296,14 @@ wxMenu *MyTaskBarIcon::CreatePopupMenu()
     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"));
     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    
+#else

     menu->AppendSeparator();
     menu->Append(PU_EXIT,    _T("E&xit"));
     menu->AppendSeparator();
     menu->Append(PU_EXIT,    _T("E&xit"));

-#endif
+#endif // USE_DRAWER_CODE / !USE_DRAWER_CODE

     return menu;
 }
 
     return menu;
 }
 

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

 {
     dialog->Show(true);
 }
 {
     dialog->Show(true);
 }

diff --git a/samples/drawer/drawertest.h b/samples/drawer/drawertest.h
index be2613b4cf195679f37d979c8f83bdec18158dfa..0555ccae30268bb259151dee575e04c5e401873d 100644 (file)
--- a/samples/drawer/drawertest.h
+++ b/samples/drawer/drawertest.h
@@ -9,19 +9,25 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+    #define USE_DRAWER_CODE 1
+#else
+    #define USE_DRAWER_CODE 0
+#endif
+

 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:
     MyTaskBarIcon() {};
 
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:
     MyTaskBarIcon() {};
 

-    void OnLButtonDClick(wxTaskBarIconEvent&);
+    void OnLeftButtonDClick(wxTaskBarIconEvent&);

     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
 
     void OnMenuSetNewIcon(wxCommandEvent&);
     void OnMenuSetOldIcon(wxCommandEvent&);
 
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
 
     void OnMenuSetNewIcon(wxCommandEvent&);
     void OnMenuSetOldIcon(wxCommandEvent&);
 

-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+#if USE_DRAWER_CODE

     class MyDrawer* m_pMyDrawer;
     MyTaskBarIcon(class MyDrawer* p) {m_pMyDrawer = p;}
 
     class MyDrawer* m_pMyDrawer;
     MyTaskBarIcon(class MyDrawer* p) {m_pMyDrawer = p;}
 


@@ -32,7 +38,7 @@ public:
     void OnMenuRightDrawer(wxCommandEvent&);
     void OnMenuTopDrawer(wxCommandEvent&);
     void OnMenuBottomDrawer(wxCommandEvent&);
     void OnMenuRightDrawer(wxCommandEvent&);
     void OnMenuTopDrawer(wxCommandEvent&);
     void OnMenuBottomDrawer(wxCommandEvent&);

-#endif //10.2+
+#endif // USE_DRAWER_CODE

 
     virtual wxMenu *CreatePopupMenu();
 
 
     virtual wxMenu *CreatePopupMenu();