Changes needed for scanning the aui header files with SWIG for

[wxWidgets.git] / samples / aui / auidemo.cpp

diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index ea8ccd1c521d9370b63907a39fead57d94007882..47a6a43ba19d297bbaa7689464bb4b6b271a2ba6 100644 (file)
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"

+

 #include "wx/grid.h"
 #include "wx/treectrl.h"
 #include "wx/spinctrl.h"
 #include "wx/grid.h"
 #include "wx/treectrl.h"
 #include "wx/spinctrl.h"


@@ -25,6 +26,8 @@
 #include "wx/image.h"
 #include "wx/colordlg.h"
 #include "wx/wxhtml.h"
 #include "wx/image.h"
 #include "wx/colordlg.h"
 #include "wx/wxhtml.h"

+#include "wx/imaglist.h"
+#include "wx/dataobj.h"

 
 #include "wx/aui/aui.h"
 #include "../sample.xpm"
 
 #include "wx/aui/aui.h"
 #include "../sample.xpm"


@@ -87,7 +90,7 @@ public:
     void DoUpdate();
 
 private:
     void DoUpdate();
 
 private:

-    wxTextCtrl* CreateTextCtrl();
+    wxTextCtrl* CreateTextCtrl(const wxString& text = wxEmptyString);

     wxGrid* CreateGrid();
     wxTreeCtrl* CreateTreeCtrl();
     wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);
     wxGrid* CreateGrid();
     wxTreeCtrl* CreateTreeCtrl();
     wxSizeReportCtrl* CreateSizeReportCtrl(int width = 80, int height = 80);


@@ -98,33 +101,35 @@ private:
 
 private:
 
 
 private:
 

-    void OnEraseBackground(wxEraseEvent& event);
-    void OnSize(wxSizeEvent& event);
-
-    void OnCreateTree(wxCommandEvent& event);
-    void OnCreateGrid(wxCommandEvent& event);
-    void OnCreateHTML(wxCommandEvent& event);
-    void OnCreateText(wxCommandEvent& event);
-    void OnCreateSizeReport(wxCommandEvent& event);
-    void OnChangeContentPane(wxCommandEvent& event);
-    void OnCreatePerspective(wxCommandEvent& event);
-    void OnCopyPerspectiveCode(wxCommandEvent& event);
-    void OnRestorePerspective(wxCommandEvent& event);
-    void OnSettings(wxCommandEvent& event);
-    void OnExit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-    void OnGradient(wxCommandEvent& event);
-    void OnManagerFlag(wxCommandEvent& event);
-    void OnUpdateUI(wxUpdateUIEvent& event);
-
+    void OnEraseBackground(wxEraseEvent& evt);
+    void OnSize(wxSizeEvent& evt);
+
+    void OnCreateTree(wxCommandEvent& evt);
+    void OnCreateGrid(wxCommandEvent& evt);
+    void OnCreateHTML(wxCommandEvent& evt);
+    void OnCreateText(wxCommandEvent& evt);
+    void OnCreateSizeReport(wxCommandEvent& evt);
+    void OnChangeContentPane(wxCommandEvent& evt);
+    void OnCreatePerspective(wxCommandEvent& evt);
+    void OnCopyPerspectiveCode(wxCommandEvent& evt);
+    void OnRestorePerspective(wxCommandEvent& evt);
+    void OnSettings(wxCommandEvent& evt);
+    void OnExit(wxCommandEvent& evt);
+    void OnAbout(wxCommandEvent& evt);
+
+    void OnGradient(wxCommandEvent& evt);
+    void OnManagerFlag(wxCommandEvent& evt);
+    void OnUpdateUI(wxUpdateUIEvent& evt);
+
+    void OnPaneClose(wxFrameManagerEvent& evt);
+    

 private:
 
     wxFrameManager m_mgr;
     wxArrayString m_perspectives;
     wxMenu* m_perspectives_menu;
 
 private:
 
     wxFrameManager m_mgr;
     wxArrayString m_perspectives;
     wxMenu* m_perspectives_menu;
 

-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()

 };
 
 
 };
 
 


@@ -202,7 +207,7 @@ private:
 
     wxFrameManager* m_mgr;
 
 
     wxFrameManager* m_mgr;
 

-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()

 };
 
 BEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl)
 };
 
 BEGIN_EVENT_TABLE(wxSizeReportCtrl, wxControl)


@@ -570,6 +575,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)
     EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000,
                    MyFrame::OnRestorePerspective)
     EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)
     EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000,
                    MyFrame::OnRestorePerspective)

+    EVT_AUI_PANECLOSE(MyFrame::OnPaneClose)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -762,8 +768,9 @@ MyFrame::MyFrame(wxWindow* parent,
                   BestSize(wxSize(200,100)).MinSize(wxSize(200,100)).
                   Bottom().Layer(1));
 
                   BestSize(wxSize(200,100)).MinSize(wxSize(200,100)).
                   Bottom().Layer(1));
 

-    m_mgr.AddPane(CreateTextCtrl(), wxPaneInfo().
-                  Name(wxT("test10")).Caption(wxT("Text Pane")).
+    wxWindow* wnd10 = CreateTextCtrl(wxT("This pane will prompt the user before hiding."));
+    m_mgr.AddPane(wnd10, wxPaneInfo().
+                  Name(wxT("test10")).Caption(wxT("Text Pane with Hide Prompt")).

                   Bottom().Layer(1).Position(1));
 
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().
                   Bottom().Layer(1).Position(1));
 
     m_mgr.AddPane(CreateSizeReportCtrl(), wxPaneInfo().


@@ -826,7 +833,6 @@ MyFrame::MyFrame(wxWindow* parent,
                   LeftDockable(false).RightDockable(false));
 
 
                   LeftDockable(false).RightDockable(false));
 
 

-

     // make some default perspectives
 
     wxString perspective_all = m_mgr.SavePerspective();
     // make some default perspectives
 
     wxString perspective_all = m_mgr.SavePerspective();


@@ -907,12 +913,12 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event)
 {
     unsigned int flag = 0;
 
 {
     unsigned int flag = 0;
 

-#ifndef __WXMSW__
+#if !defined(__WXMSW__) && !defined(__WXMAC__)

     if (event.GetId() == ID_TransparentDrag ||
         event.GetId() == ID_TransparentHint ||
         event.GetId() == ID_TransparentHintFade)
     {
     if (event.GetId() == ID_TransparentDrag ||
         event.GetId() == ID_TransparentHint ||
         event.GetId() == ID_TransparentHintFade)
     {

-        wxMessageBox(wxT("This option is presently only available on wxMSW"));
+        wxMessageBox(wxT("This option is presently only available on wxMSW and wxMac"));

         return;
     }
 #endif
         return;
     }
 #endif


@@ -959,6 +965,21 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
     }
 }
 
     }
 }
 

+void MyFrame::OnPaneClose(wxFrameManagerEvent& evt)
+{
+    if (evt.pane->name == wxT("test10"))
+    {
+        int res = wxMessageBox(wxT("Are you sure you want to close/hide this pane?"),
+                               wxT("wxAUI"),
+                               wxYES_NO,
+                               this);
+        if (res != wxYES)
+            evt.Veto();
+    }
+}
+
+
+

 void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))
 {
     wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"),
 void MyFrame::OnCreatePerspective(wxCommandEvent& WXUNUSED(event))
 {
     wxTextEntryDialog dlg(this, wxT("Enter a name for the new perspective:"),


@@ -981,11 +1002,13 @@ void MyFrame::OnCopyPerspectiveCode(wxCommandEvent& WXUNUSED(event))
 {
     wxString s = m_mgr.SavePerspective();
 
 {
     wxString s = m_mgr.SavePerspective();
 

+#if wxUSE_CLIPBOARD

     if (wxTheClipboard->Open())
     {
         wxTheClipboard->SetData(new wxTextDataObject(s));
         wxTheClipboard->Close();
     }
     if (wxTheClipboard->Open())
     {
         wxTheClipboard->SetData(new wxTextDataObject(s));
         wxTheClipboard->Close();
     }

+#endif

 }
 
 void MyFrame::OnRestorePerspective(wxCommandEvent& event)
 }
 
 void MyFrame::OnRestorePerspective(wxCommandEvent& event)


@@ -1065,12 +1088,15 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxMessageBox(_("wxAUI Demo\nAn advanced window management library for wxWidgets\n(c) Copyright 2005-2006, Kirix Corporation"), _("About wxAUI Demo"), wxOK, this);
 }
 
     wxMessageBox(_("wxAUI Demo\nAn advanced window management library for wxWidgets\n(c) Copyright 2005-2006, Kirix Corporation"), _("About wxAUI Demo"), wxOK, this);
 }
 

-wxTextCtrl* MyFrame::CreateTextCtrl()
+wxTextCtrl* MyFrame::CreateTextCtrl(const wxString& ctrl_text)

 {
 {

-    wxString text;

     static int n = 0;
 
     static int n = 0;
 

-    text.Printf(wxT("This is text box %d"), ++n);
+    wxString text;
+    if (ctrl_text.Length() > 0)
+        text = ctrl_text;
+         else
+        text.Printf(wxT("This is text box %d"), ++n);

 
     return new wxTextCtrl(this,wxID_ANY, text,
                           wxPoint(0,0), wxSize(150,90),
 
     return new wxTextCtrl(this,wxID_ANY, text,
                           wxPoint(0,0), wxSize(150,90),