use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

[wxWidgets.git] / samples / widgets / widgets.h

diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index bfd7ca6b4f0610921a3cf011ea64c98fab8c92af..6c45ee11ff5d1a595f09f22491cd0bbbe5778df1 100644 (file)
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample

 // Name:        widgets.h
 // Purpose:     Common stuff for all widgets project files
 // Author:      Vadim Zeitlin
 // Name:        widgets.h
 // Purpose:     Common stuff for all widgets project files
 // Author:      Vadim Zeitlin


@@ -13,25 +13,34 @@
 #define _WX_SAMPLE_WIDGETS_H_
 
 class WXDLLEXPORT wxCheckBox;
 #define _WX_SAMPLE_WIDGETS_H_
 
 class WXDLLEXPORT wxCheckBox;

-class WXDLLEXPORT wxNotebook;
+class WXDLLEXPORT wxBookCtrl;

 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxTextCtrl;
 
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxTextCtrl;
 

-class WXDLLEXPORT WidgetsPageInfo;
+class WidgetsPageInfo;

 
 #include "wx/panel.h"
 
 // all source files use wxImageList
 #include "wx/imaglist.h"
 
 
 #include "wx/panel.h"
 
 // all source files use wxImageList
 #include "wx/imaglist.h"
 

+#if wxUSE_LOG && !defined(__SMARTPHONE__)
+    #define USE_LOG 1
+#else
+    #define USE_LOG 0
+#endif
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// WidgetsPage: a notebook page demonstrating some widget
+// WidgetsPage: a book page demonstrating some widget

 // ----------------------------------------------------------------------------
 
 class WidgetsPage : public wxPanel
 {
 public:
 // ----------------------------------------------------------------------------
 
 class WidgetsPage : public wxPanel
 {
 public:

-    WidgetsPage(wxNotebook *notebook);
+    WidgetsPage(wxBookCtrl *book);
+
+    // return the control shown by this page
+    virtual wxControl *GetWidget() const = 0;

 
 protected:
     // several helper functions for page creation
 
 protected:
     // several helper functions for page creation


@@ -40,24 +49,24 @@ protected:
     // (pointer to which will be saved in the provided variable if not NULL)
     // with the specified id
     wxSizer *CreateSizerWithText(wxControl *control,
     // (pointer to which will be saved in the provided variable if not NULL)
     // with the specified id
     wxSizer *CreateSizerWithText(wxControl *control,

-                                 wxWindowID id = -1,
+                                 wxWindowID id = wxID_ANY,

                                  wxTextCtrl **ppText = NULL);
 
     // create a sizer containing a label and a text ctrl
     wxSizer *CreateSizerWithTextAndLabel(const wxString& label,
                                  wxTextCtrl **ppText = NULL);
 
     // create a sizer containing a label and a text ctrl
     wxSizer *CreateSizerWithTextAndLabel(const wxString& label,

-                                         wxWindowID id = -1,
+                                         wxWindowID id = wxID_ANY,

                                          wxTextCtrl **ppText = NULL);
 
     // create a sizer containing a button and a text ctrl
     wxSizer *CreateSizerWithTextAndButton(wxWindowID idBtn,
                                           const wxString& labelBtn,
                                          wxTextCtrl **ppText = NULL);
 
     // create a sizer containing a button and a text ctrl
     wxSizer *CreateSizerWithTextAndButton(wxWindowID idBtn,
                                           const wxString& labelBtn,

-                                          wxWindowID id = -1,
+                                          wxWindowID id = wxID_ANY,

                                           wxTextCtrl **ppText = NULL);
 
     // create a checkbox and add it to the sizer
     wxCheckBox *CreateCheckBoxAndAddToSizer(wxSizer *sizer,
                                             const wxString& label,
                                           wxTextCtrl **ppText = NULL);
 
     // create a checkbox and add it to the sizer
     wxCheckBox *CreateCheckBoxAndAddToSizer(wxSizer *sizer,
                                             const wxString& label,

-                                            wxWindowID id = -1);
+                                            wxWindowID id = wxID_ANY);

 
 public:
     // the head of the linked list containinginfo about all pages
 
 public:
     // the head of the linked list containinginfo about all pages


@@ -68,10 +77,10 @@ public:
 // dynamic WidgetsPage creation helpers
 // ----------------------------------------------------------------------------
 
 // dynamic WidgetsPage creation helpers
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT WidgetsPageInfo
+class WidgetsPageInfo

 {
 public:
 {
 public:

-    typedef WidgetsPage *(*Constructor)(wxNotebook *notebook,
+    typedef WidgetsPage *(*Constructor)(wxBookCtrl *book,

                                         wxImageList *imaglist);
 
     // our ctor
                                         wxImageList *imaglist);
 
     // our ctor


@@ -82,6 +91,8 @@ public:
     Constructor GetCtor() const { return m_ctor; }
     WidgetsPageInfo *GetNext() const { return m_next; }
 
     Constructor GetCtor() const { return m_ctor; }
     WidgetsPageInfo *GetNext() const { return m_next; }
 

+    void SetNext(WidgetsPageInfo *next) { m_next = next; }
+

 private:
     // the label of the page
     wxString m_label;
 private:
     // the label of the page
     wxString m_label;


@@ -103,9 +114,9 @@ private:
 
 // and this one must be inserted somewhere in the source file
 #define IMPLEMENT_WIDGETS_PAGE(classname, label)                            \
 
 // and this one must be inserted somewhere in the source file
 #define IMPLEMENT_WIDGETS_PAGE(classname, label)                            \

-    WidgetsPage *wxCtorFor##classname(wxNotebook *notebook,                 \
+    WidgetsPage *wxCtorFor##classname(wxBookCtrl *book,                     \

                                       wxImageList *imaglist)                \
                                       wxImageList *imaglist)                \

-        { return new classname(notebook, imaglist); }                       \
+        { return new classname(book, imaglist); }                           \

     WidgetsPageInfo classname::                                             \
         ms_info##classname(wxCtorFor##classname, label)
 
     WidgetsPageInfo classname::                                             \
         ms_info##classname(wxCtorFor##classname, label)