wxSocket::Initialize() and Shutdown() are for main thread only.

[wxWidgets.git] / interface / wx / wizard.h

diff --git a/interface/wx/wizard.h b/interface/wx/wizard.h
index 921527cafba3cb3a41055a034c377b7d27ff1f48..3204fba1987158e79638819a4dde17d8dbfe8107 100644 (file)
--- a/interface/wx/wizard.h
+++ b/interface/wx/wizard.h
@@ -71,7 +71,7 @@ public:
 
         @see GetPrev()
     */
 
         @see GetPrev()
     */

-    wxWizardPage* GetNext() const;
+    virtual wxWizardPage* GetNext() const = 0;

 
     /**
         Get the page which should be shown when the user chooses the @c "Back"
 
     /**
         Get the page which should be shown when the user chooses the @c "Back"


@@ -81,7 +81,7 @@ public:
 
         @see GetNext()
     */
 
         @see GetNext()
     */

-    wxWizardPage* GetPrev() const;
+    virtual wxWizardPage* GetPrev() const = 0;

 };
 
 
 };
 
 


@@ -120,8 +120,8 @@ public:
         It is not normally used by the user code as the objects of this
         type are constructed by wxWizard.
     */
         It is not normally used by the user code as the objects of this
         type are constructed by wxWizard.
     */

-    wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1,
-                  bool direction = true);
+    wxWizardEvent(wxEventType type = wxEVT_NULL, int id = wxID_ANY,
+                  bool direction = true, wxWizardPage* page = 0);

 
     /**
         Return the direction in which the page is changing: for
 
     /**
         Return the direction in which the page is changing: for


@@ -162,7 +162,7 @@ public:
         Constructor takes the previous and next pages.
         They may be modified later by SetPrev() or SetNext().
     */
         Constructor takes the previous and next pages.
         They may be modified later by SetPrev() or SetNext().
     */

-    wxWizardPageSimple(wxWizard* parent = NULL,
+    wxWizardPageSimple(wxWizard* parent,

                        wxWizardPage* prev = NULL,
                        wxWizardPage* next = NULL,
                        const wxBitmap& bitmap = wxNullBitmap);
                        wxWizardPage* prev = NULL,
                        wxWizardPage* next = NULL,
                        const wxBitmap& bitmap = wxNullBitmap);


@@ -223,7 +223,7 @@ public:
     wxDialog::EnableLayoutAdaptation() or per dialog with wxDialog::SetLayoutAdaptationMode().
     For more about layout adaptation, see @ref overview_dialog_autoscrolling.
 
     wxDialog::EnableLayoutAdaptation() or per dialog with wxDialog::SetLayoutAdaptationMode().
     For more about layout adaptation, see @ref overview_dialog_autoscrolling.
 

-    @beginEventTable{wxWizardEvent}
+    @beginEventEmissionTable{wxWizardEvent}

     For some events, Veto() can be called to prevent the event from happening.
     @event{EVT_WIZARD_PAGE_CHANGED(id, func)}
         The page has just been changed (this event cannot be vetoed).
     For some events, Veto() can be called to prevent the event from happening.
     @event{EVT_WIZARD_PAGE_CHANGED(id, func)}
         The page has just been changed (this event cannot be vetoed).


@@ -280,7 +280,7 @@ public:
         @param parent
             The parent window, may be @NULL.
         @param id
         @param parent
             The parent window, may be @NULL.
         @param id

-            The id of the dialog, will usually be just -1.
+            The id of the dialog, will usually be just wxID_ANY.

         @param title
             The title of the dialog.
         @param bitmap
         @param title
             The title of the dialog.
         @param bitmap


@@ -290,7 +290,7 @@ public:
         @param style
             Window style is passed to wxDialog.
     */
         @param style
             Window style is passed to wxDialog.
     */

-    wxWizard(wxWindow* parent, int id = -1,
+    wxWizard(wxWindow* parent, int id = wxID_ANY,

              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,
              const wxPoint& pos = wxDefaultPosition,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,
              const wxPoint& pos = wxDefaultPosition,


@@ -318,11 +318,10 @@ public:
         @param style
             Window style is passed to wxDialog.
     */
         @param style
             Window style is passed to wxDialog.
     */

-    bool Create(wxWindow* parent, int id = -1,
+    bool Create(wxWindow* parent, int id = wxID_ANY,

                 const wxString& title = wxEmptyString,
                 const wxBitmap& bitmap = wxNullBitmap,
                 const wxString& title = wxEmptyString,
                 const wxBitmap& bitmap = wxNullBitmap,

-                const wxPoint& pos = wxDefaultPosition,
-                long style = wxDEFAULT_DIALOG_STYLE);
+                const wxPoint& pos = wxDefaultPosition, long style = 536877056);

 
     /**
         This method is obsolete, use GetPageAreaSizer() instead.
 
     /**
         This method is obsolete, use GetPageAreaSizer() instead.


@@ -495,9 +494,6 @@ public:
         using the sizers (even though the wizard is not resizeable) and then use
         wxSizer::CalcMin() in a loop to calculate the maximum of minimal sizes of
         the pages and pass it to SetPageSize().
         using the sizers (even though the wizard is not resizeable) and then use
         wxSizer::CalcMin() in a loop to calculate the maximum of minimal sizes of
         the pages and pass it to SetPageSize().

-
-        @deprecated
-        This method is obsolete, use GetPageAreaSizer() instead.

     */
     virtual void SetPageSize(const wxSize& sizePage);
 };
     */
     virtual void SetPageSize(const wxSize& sizePage);
 };