(should) fix unix compilation...

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

diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index 229a9337deaf6f54516799372fc772a624b7e570..d05402ecd26076f1b5a249a3da43c87612d84926 100644 (file)
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -17,7 +17,9 @@ class WXDLLEXPORT wxNotebook;
 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"
 
 // all source files use wxImageList
 #include "wx/imaglist.h"


@@ -38,24 +40,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


@@ -66,7 +68,7 @@ public:
 // dynamic WidgetsPage creation helpers
 // ----------------------------------------------------------------------------
 
 // dynamic WidgetsPage creation helpers
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT WidgetsPageInfo
+class WidgetsPageInfo

 {
 public:
     typedef WidgetsPage *(*Constructor)(wxNotebook *notebook,
 {
 public:
     typedef WidgetsPage *(*Constructor)(wxNotebook *notebook,