document that GetSubItemRect() is new since 2.7.0

[wxWidgets.git] / samples / dynamic / dynamic.cpp

diff --git a/samples/dynamic/dynamic.cpp b/samples/dynamic/dynamic.cpp
index c32ca01362065e6587131f1bcb2a23b73850c7ab..571e1cfdf83a07ab7dbca98bef6e2ee2cdedfd37 100644 (file)
--- a/samples/dynamic/dynamic.cpp
+++ b/samples/dynamic/dynamic.cpp
@@ -1,19 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dynamic.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dynamic.cpp

-// Purpose:     Dynamic events wxWindows sample
+// Purpose:     Dynamic events wxWidgets sample

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dynamic.cpp"
-#pragma interface "dynamic.cpp"
-#endif
-

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


@@ -25,31 +20,45 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#include "wx/clntdata.h"
+
+#ifndef __WXMSW__

 #include "mondrian.xpm"
 #endif
 
 // Define a new application type
 class MyApp: public wxApp
 #include "mondrian.xpm"
 #endif
 
 // Define a new application type
 class MyApp: public wxApp

-{ public:
+{
+public:

     bool OnInit(void);
 };
 
 // Define a new frame type
 class MyFrame: public wxFrame
     bool OnInit(void);
 };
 
 // Define a new frame type
 class MyFrame: public wxFrame

-{ public:
-    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
+{
+public:
+    MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);

 
 

- public:
+public:

     void OnQuit(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);

+    void OnTest(wxCommandEvent& event);

     void OnAbout(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

-  bool OnClose(void) { return TRUE; }
+
+protected:
+    wxShadowObject m_shadow;
+};
+
+// Define another new frame type
+class MySecondFrame: public MyFrame
+{
+public:
+    MySecondFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);

 };
 
 // ID for the menu commands
 };
 
 // ID for the menu commands

-#define DYNAMIC_QUIT   1
-#define DYNAMIC_TEXT   101
-#define DYNAMIC_ABOUT   102
+#define DYNAMIC_QUIT   wxID_EXIT
+#define DYNAMIC_TEST   101
+#define DYNAMIC_ABOUT  wxID_ABOUT

 
 // Create a new application object
 IMPLEMENT_APP  (MyApp)
 
 // Create a new application object
 IMPLEMENT_APP  (MyApp)


@@ -57,61 +66,109 @@ IMPLEMENT_APP  (MyApp)
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit(void)
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit(void)
 {

-  // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, "Dynamic wxWindows App", 50, 50, 450, 340);
+    // Create the main frame window
+    MyFrame *frame = new MyFrame(NULL, _T("Dynamic wxWidgets App"), 50, 50, 450, 340);

 
 

-  frame->Connect( DYNAMIC_QUIT,  -1, wxEVT_COMMAND_MENU_SELECTED,
-                  (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction)
-                  &MyFrame::OnQuit );
-  frame->Connect( DYNAMIC_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED,
-                  (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction)
-                  &MyFrame::OnAbout );
+    // Show the frame
+    frame->Show(true);

 
 

-  // Give it an icon
+    // Create the main frame window
+    MySecondFrame *frame2 = new MySecondFrame(NULL, _T("Dynamic wxWidgets App"), 150, 150, 450, 340);
+
+    // Show the frame
+    frame2->Show(true);
+
+    SetTopWindow(frame);
+
+    return true;
+}
+
+// -------------------------------------
+// MyFrame
+// -------------------------------------
+
+// Callback from wxShadowObject
+
+int cb_MyFrame_InitStatusbar( void* window, void* WXUNUSED(param) )
+{
+    MyFrame *frame = (MyFrame*) window;
+    frame->SetStatusText( wxT("Hello from MyFrame"), 0 );
+    return 0;
+}
+
+// My frame constructor
+MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
+  wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
+{
+    // Give it an icon

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-  frame->SetIcon(wxIcon("mondrian"));
+    SetIcon(wxIcon(_T("mondrian")));

 #else
 #else

-  frame->SetIcon(wxIcon(mondrian_xpm));
+    SetIcon(wxIcon(mondrian_xpm));

 #endif
 
 #endif
 

-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
+    // Make a menubar
+    wxMenu *file_menu = new wxMenu;

 
 

-  file_menu->Append(DYNAMIC_ABOUT, "&About");
-  file_menu->Append(DYNAMIC_QUIT, "E&xit");
-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
-  frame->SetMenuBar(menu_bar);
+    file_menu->Append(DYNAMIC_ABOUT, _T("&About"));
+    file_menu->Append(DYNAMIC_TEST, _T("&Test"));
+    file_menu->Append(DYNAMIC_QUIT, _T("E&xit"));
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, _T("&File"));
+    SetMenuBar(menu_bar);

 
 

-  // Make a panel with a message
-  wxPanel *panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL);
+    // Make a panel with a message
+    wxPanel *panel = new wxPanel(this, wxID_ANY, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL);

 
 

-  (void)new wxStaticText(panel, 311, "Hello!", wxPoint(10, 10), wxSize(-1, -1), 0);
+    (void)new wxStaticText(panel, 311, _T("Hello!"), wxPoint(10, 10), wxDefaultSize, 0);

 
 

-  // Show the frame
-  frame->Show(TRUE);
+    // You used to have to do some casting for param 4, but now there are type-safe handlers
+    Connect( DYNAMIC_QUIT,  wxID_ANY,
+                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnQuit) );
+    Connect( DYNAMIC_TEST, wxID_ANY,
+                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnTest) );
+    Connect( DYNAMIC_ABOUT, wxID_ANY,
+                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnAbout) );

 
 

-  SetTopWindow(frame);
-
-  return TRUE;
+    CreateStatusBar();
+    m_shadow.AddMethod( wxT("OnTest"), &cb_MyFrame_InitStatusbar );

 }
 
 }
 

-// My frame constructor
-MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
-  wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
-{}
-

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {

-  Close(TRUE);
+    Close(true);
+}
+
+void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event) )
+{
+    m_shadow.InvokeMethod( wxT("OnTest"), this, NULL, NULL );

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {

-  wxMessageDialog dialog(this, "This demonstrates dynamic event handling",
-    "About Dynamic", wxYES_NO|wxCANCEL);
+    wxMessageDialog dialog(this, _T("This demonstrates dynamic event handling"),
+        _T("About Dynamic"), wxYES_NO|wxCANCEL);

 
 

-  dialog.ShowModal();
+    dialog.ShowModal();

 }
 
 
 }
 
 

+// -------------------------------------
+// MySecondFrame
+// -------------------------------------
+
+// Callback from wxShadowObject
+
+int cb_MySecondFrame_InitStatusbar( void* window, void* WXUNUSED(param) )
+{
+    MySecondFrame *frame = (MySecondFrame*) window;
+    frame->SetStatusText( wxT("Hello from MySecondFrame"), 0 );
+    return 0;
+}
+
+// My frame constructor
+MySecondFrame::MySecondFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
+  MyFrame(frame, title, x, y, w, h )
+{
+    m_shadow.AddMethod( wxT("OnTest"), &cb_MySecondFrame_InitStatusbar );
+}