added wxDIB(HBITMAP) ctor and corresponding Create(); made GetData() return uchar...

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

diff --git a/samples/notebook/notebook.h b/samples/notebook/notebook.h
index 20862f7327e5835ae2b8a301637eed67b0cadee3..8a5bcc7ffb514643928606e099d87e3ccdcb8008 100644 (file)
--- a/samples/notebook/notebook.h
+++ b/samples/notebook/notebook.h
@@ -5,7 +5,7 @@
 // Modified by: Dimitri Schoolwerth
 // Created:     25/10/98
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998-2002 wxWindows team
+// Copyright:   (c) 1998-2002 wxWidgets team
 // License:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -48,7 +48,7 @@ DECLARE_APP(MyApp)
 class MyNotebook : public wxNotebook
 {
 public:
-    MyNotebook(wxWindow *parent, wxWindowID id = -1,
+    MyNotebook(wxWindow *parent, wxWindowID id = wxID_ANY,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0);
 
@@ -105,7 +105,8 @@ private:
     wxPanel *m_panel; // Panel containing notebook and other controls
 
     wxRadioBox *m_radioOrient;
-    wxCheckBox *m_chkShowImages;
+    wxCheckBox *m_chkShowImages,
+               *m_chkMultiLine;
 
     wxButton *m_btnAddPage;
     wxButton *m_btnInsertPage;
@@ -116,9 +117,10 @@ private:
 
     MyNotebook *m_notebook;
 
+#if wxUSE_LOG
     // Log window
     wxTextCtrl *m_text;
-
+#endif // wxUSE_LOG
 
     // Sizers
 
@@ -129,9 +131,6 @@ private:
     // Sizer that contains the notebook and controls on the left
     wxBoxSizer *m_sizerTop;
 
-    // Sizer for m_notebook
-    wxBookCtrlSizer *m_sizerNotebook;
-
     wxImageList *m_imageList;
 
     DECLARE_EVENT_TABLE()
@@ -141,6 +140,7 @@ enum ID_CONTROLS
 {
     ID_RADIO_ORIENT = wxID_HIGHEST,
     ID_CHK_SHOWIMAGES,
+    ID_CHK_MULTILINE,
     ID_BTN_ADD_PAGE,
     ID_BTN_INSERT_PAGE,
     ID_BTN_DELETE_CUR_PAGE,