Fix a couple of export declarations

[wxWidgets.git] / include / wx / generic / wizard.h

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 712c6796ba452592e2118b90b4924ac12e941c8c..fdd07ddea9ca3a275f5904885a2f55f8bb5db300 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        generic/wizard.h
+// Name:        wx/generic/wizard.h

 // Purpose:     declaration of generic wxWizard class
 // Author:      Vadim Zeitlin
 // Modified by: Robert Vazan (sizers)
 // Purpose:     declaration of generic wxWizard class
 // Author:      Vadim Zeitlin
 // Modified by: Robert Vazan (sizers)


@@ -9,27 +9,26 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GENERIC_WIZARD_H_
+#define _WX_GENERIC_WIZARD_H_
+

 // ----------------------------------------------------------------------------
 // wxWizard
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxWizard
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "wizardg.h"
-#endif
-

 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticBitmap;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticBitmap;

-class WXDLLEXPORT wxWizardEvent;
+class WXDLLIMPEXP_ADV wxWizardEvent;

 class WXDLLEXPORT wxBoxSizer;
 class WXDLLEXPORT wxBoxSizer;

-class WXDLLEXPORT wxWizardSizer;
+class WXDLLIMPEXP_ADV wxWizardSizer;

 
 

-class WXDLLEXPORT wxWizard : public wxWizardBase
+class WXDLLIMPEXP_ADV wxWizard : public wxWizardBase

 {
 public:
     // ctor
     wxWizard() { Init(); }
     wxWizard(wxWindow *parent,
 {
 public:
     // ctor
     wxWizard() { Init(); }
     wxWizard(wxWindow *parent,

-             int id = -1,
+             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,


@@ -39,7 +38,7 @@ public:
         Create(parent, id, title, bitmap, pos, style);
     }
     bool Create(wxWindow *parent,
         Create(parent, id, title, bitmap, pos, style);
     }
     bool Create(wxWindow *parent,

-             int id = -1,
+             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,


@@ -62,14 +61,17 @@ public:
     bool IsRunning() const { return m_page != NULL; }
 
     // show the prev/next page, but call TransferDataFromWindow on the current
     bool IsRunning() const { return m_page != NULL; }
 
     // show the prev/next page, but call TransferDataFromWindow on the current

-    // page first and return FALSE without changing the page if
-    // TransferDataFromWindow() returns FALSE - otherwise, returns TRUE
-    bool ShowPage(wxWizardPage *page, bool goingForward = TRUE);
+    // page first and return false without changing the page if
+    // TransferDataFromWindow() returns false - otherwise, returns true
+    bool ShowPage(wxWizardPage *page, bool goingForward = true);

 
     // do fill the dialog with controls
     // this is app-overridable to, for example, set help and tooltip text
     virtual void DoCreateControls();
 
 
     // do fill the dialog with controls
     // this is app-overridable to, for example, set help and tooltip text
     virtual void DoCreateControls();
 

+protected:
+    void FinishLayout();
+

 private:
     // was the dialog really created?
     bool WasCreated() const { return m_btnPrev != NULL; }
 private:
     // was the dialog really created?
     bool WasCreated() const { return m_btnPrev != NULL; }


@@ -86,10 +88,8 @@ private:
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 
     void AddBackNextPair(wxBoxSizer *buttonRow);
     void AddButtonRow(wxBoxSizer *mainColumn);
 

-    void FinishLayout();
-    

     wxSize GetManualPageSize() const;
     wxSize GetManualPageSize() const;

-    
+

     // the page size requested by user
     wxSize m_sizePage;
 
     // the page size requested by user
     wxSize m_sizePage;
 


@@ -109,20 +109,24 @@ private:
     bool m_calledSetBorder;
     // Border around page area sizer requested using SetBorder()
     int m_border;
     bool m_calledSetBorder;
     // Border around page area sizer requested using SetBorder()
     int m_border;

-    
+

     // Whether RunWizard() was called
     bool m_started;
     // Whether RunWizard() was called
     bool m_started;

-    
+
+    // Whether was modal (modeless has to be destroyed on finish or cancel)
+    bool m_wasModal;
+

     // Page area sizer will be inserted here with padding
     wxBoxSizer *m_sizerBmpAndPage;
     // Page area sizer will be inserted here with padding
     wxBoxSizer *m_sizerBmpAndPage;

-    
+

     // Actual position and size of pages
     wxWizardSizer *m_sizerPage;
     // Actual position and size of pages
     wxWizardSizer *m_sizerPage;

-    
+

     friend class wxWizardSizer;
     friend class wxWizardSizer;

-    
+

     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxWizard)
 };
 
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxWizard)
 };
 

+#endif // _WX_GENERIC_WIZARD_H_