Cleaned up some comments, reorganized some code

[wxWidgets.git] / contrib / samples / gizmos / dynsash / dynsash.cpp

diff --git a/contrib/samples/gizmos/dynsash/dynsash.cpp b/contrib/samples/gizmos/dynsash/dynsash.cpp
index 8e7bbb4efe37b02456f8c6a2b38495ab111f7cad..e31b11c036680eed3a29d3cffc57fa8f5ef564d3 100644 (file)
--- a/contrib/samples/gizmos/dynsash/dynsash.cpp
+++ b/contrib/samples/gizmos/dynsash/dynsash.cpp
@@ -10,10 +10,25 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers (this file is usually all you
+// need because it includes almost all "standard" wxWindows headers)
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
 #include <wx/app.h>
+#include <wx/frame.h>
 #include <wx/gizmos/dynamicsash.h>
 #include <wx/html/htmlwin.h>
 #include <wx/image.h>
+#include <wx/cmdline.h>
 
 class Demo : public wxApp {
 public:
@@ -24,7 +39,7 @@ class SashHtmlWindow : public wxHtmlWindow {
 public:
     SashHtmlWindow(wxWindow *parent, wxWindowID id = -1,
                    const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                   long style = wxHW_SCROLLBAR_NEVER, const wxString& name = "sashHtmlWindow");
+                   long style = wxHW_SCROLLBAR_NEVER, const wxString& name = wxT("sashHtmlWindow"));
 
     wxSize DoGetBestSize() const;
 
@@ -36,19 +51,18 @@ private:
 
 IMPLEMENT_APP(Demo)
 
-char *HTML_content =
-"<P><H1>wxDynamicSashWindow demo</H1>"
+wxChar *HTML_content =
+wxT("<P><H1>wxDynamicSashWindow demo</H1>"
 "<P>Here is an example of how you can use <TT>wxDynamicSashWindow</TT> to allow your users to "
 "dynamically split and unify the views of your windows.  Try dragging out a few splits "
 "and then reunifying the window."
 "<P>Also, see the <TT>dynsash_switch</TT> sample for an example of an application which "
-"manages the scrollbars provided by <TT>wxDynamicSashWindow</TT> itself."
-;
+"manages the scrollbars provided by <TT>wxDynamicSashWindow</TT> itself.");
 
 bool Demo::OnInit() {
     wxInitAllImageHandlers();
 
-    wxFrame *frame = new wxFrame(NULL, -1, "Dynamic Sash Demo");
+    wxFrame *frame = new wxFrame(NULL, -1, wxT("Dynamic Sash Demo"));
     frame->SetSize(480, 480);
 
     wxDynamicSashWindow *sash = new wxDynamicSashWindow(frame, -1);
@@ -64,7 +78,8 @@ bool Demo::OnInit() {
 SashHtmlWindow::SashHtmlWindow(wxWindow *parent, wxWindowID id,
                                const wxPoint& pos, const wxSize& size, long style, const wxString& name) :
                                     wxHtmlWindow(parent, id, pos, size, style, name) {
-    Connect(-1, wxEVT_DYNAMIC_SASH_SPLIT, (wxObjectEventFunction)&SashHtmlWindow::OnSplit);
+    Connect(-1, wxEVT_DYNAMIC_SASH_SPLIT,
+        (wxObjectEventFunction)(wxCommandEventFunction)(wxDynamicSashSplitEventFunction) &SashHtmlWindow::OnSplit);
 
     m_dyn_sash = parent;
 }