Avoid duplicated definition errors for wxLongToLongHashMap when both

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

diff --git a/include/wx/generic/wizard.h b/include/wx/generic/wizard.h
index 68362e06ec8a499d6ca07c5939f55d26bccd5d35..be0b991c387792d4cbf4b4fb8e36c1537a1be93f 100644 (file)
--- a/include/wx/generic/wizard.h
+++ b/include/wx/generic/wizard.h
@@ -2,26 +2,28 @@
 // Name:        generic/wizard.h
 // Purpose:     declaration of generic wxWizard class
 // Author:      Vadim Zeitlin
 // Name:        generic/wizard.h
 // Purpose:     declaration of generic wxWizard class
 // Author:      Vadim Zeitlin

-// Modified by:
+// Modified by: Robert Vazan (sizers)

 // Created:     28.09.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     28.09.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "wizardg.h"
 #endif
 
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticBitmap;
     #pragma interface "wizardg.h"
 #endif
 
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticBitmap;

-class WXDLLEXPORT wxWizardEvent;
+class WXDLLIMPEXP_ADV wxWizardEvent;
+class WXDLLEXPORT wxBoxSizer;
+class WXDLLIMPEXP_ADV wxWizardSizer;

 
 

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

 {
 public:
     // ctor
 {
 public:
     // ctor


@@ -30,16 +32,18 @@ public:
              int id = -1,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,
              int id = -1,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,

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

     {
         Init();
     {
         Init();

-        Create(parent, id, title, bitmap, pos);
+        Create(parent, id, title, bitmap, pos, style);

     }
     bool Create(wxWindow *parent,
              int id = -1,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,
     }
     bool Create(wxWindow *parent,
              int id = -1,
              const wxString& title = wxEmptyString,
              const wxBitmap& bitmap = wxNullBitmap,

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

     void Init();
 
     // implement base class pure virtuals
     void Init();
 
     // implement base class pure virtuals


@@ -48,6 +52,8 @@ public:
     virtual void SetPageSize(const wxSize& size);
     virtual wxSize GetPageSize() const;
     virtual void FitToPage(const wxWizardPage *firstPage);
     virtual void SetPageSize(const wxSize& size);
     virtual wxSize GetPageSize() const;
     virtual void FitToPage(const wxWizardPage *firstPage);

+    virtual wxSizer *GetPageAreaSizer() const;
+    virtual void SetBorder(int border);

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------


@@ -75,17 +81,21 @@ private:
 
     void OnWizEvent(wxWizardEvent& event);
 
 
     void OnWizEvent(wxWizardEvent& event);
 

+    void AddBitmapRow(wxBoxSizer *mainColumn);
+    void AddStaticLine(wxBoxSizer *mainColumn);
+    void AddBackNextPair(wxBoxSizer *buttonRow);
+    void AddButtonRow(wxBoxSizer *mainColumn);
+
+    void FinishLayout();
+    
+    wxSize GetManualPageSize() const;
+    

     // the page size requested by user
     wxSize m_sizePage;
 
     // the dialog position from the ctor
     wxPoint m_posWizard;
 
     // the page size requested by user
     wxSize m_sizePage;
 
     // the dialog position from the ctor
     wxPoint m_posWizard;
 

-    // wizard dimensions
-    int          m_x, m_y;      // the origin for the pages
-    int          m_width,       // the size of the page itself
-                 m_height;      // (total width is m_width + m_x)
-

     // wizard state
     wxWizardPage *m_page;       // the current page or NULL
     wxBitmap      m_bitmap;     // the default bitmap to show
     // wizard state
     wxWizardPage *m_page;       // the current page or NULL
     wxBitmap      m_bitmap;     // the default bitmap to show


@@ -95,7 +105,24 @@ private:
                 *m_btnNext;     // the "Next>" or "Finish" button
     wxStaticBitmap *m_statbmp;  // the control for the bitmap
 
                 *m_btnNext;     // the "Next>" or "Finish" button
     wxStaticBitmap *m_statbmp;  // the control for the bitmap
 

+    // Whether user called SetBorder()
+    bool m_calledSetBorder;
+    // Border around page area sizer requested using SetBorder()
+    int m_border;
+    
+    // Whether RunWizard() was called
+    bool m_started;
+    
+    // Page area sizer will be inserted here with padding
+    wxBoxSizer *m_sizerBmpAndPage;
+    
+    // Actual position and size of pages
+    wxWizardSizer *m_sizerPage;
+    
+    friend class wxWizardSizer;
+    

     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxWizard)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxWizard)

 };
 
 };