Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h
index e072904cb20b76d09063c852d3aae8eae9c7ca2c..dd953cce0d335b3d1ef52959e680e67700219dca 100644 (file)
--- a/interface/wx/propdlg.h
+++ b/interface/wx/propdlg.h
@@ -2,8 +2,7 @@
 // Name:        propdlg.h
 // Purpose:     interface of wxPropertySheetDialog
 // Author:      wxWidgets team
 // Name:        propdlg.h
 // Purpose:     interface of wxPropertySheetDialog
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -80,7 +79,7 @@ enum wxPropertySheetDialogFlags
 
         // Add page
         wxPanel* panel = new wxPanel(GetBookCtrl(), ...);
 
         // Add page
         wxPanel* panel = new wxPanel(GetBookCtrl(), ...);

-        GetBookCtrl()->AddPage(panel, wxT("General"));
+        GetBookCtrl()->AddPage(panel, "General");

 
         LayoutDialog();
         return true;
 
         LayoutDialog();
         return true;


@@ -116,7 +115,7 @@ public:
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           long style = wxDEFAULT_DIALOG_STYLE,
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           long style = wxDEFAULT_DIALOG_STYLE,

-                          const wxString& name = "dialogBox");
+                          const wxString& name = wxDialogNameStr);

 
     /**
         Override this if you wish to add the book control in a way different from the
 
     /**
         Override this if you wish to add the book control in a way different from the


@@ -182,13 +181,6 @@ public:
     */
     void SetBookCtrl(wxBookCtrlBase* bookCtrl);
 
     */
     void SetBookCtrl(wxBookCtrlBase* bookCtrl);
 

-    /**
-        Sets the inner sizer that contains the book control and button sizer.
-
-        You will normally not need to use this.
-    */
-    void SetInnerSizer(wxSizer* sizer);
-

     /**
         You can customize the look and feel of the dialog by setting the sheet style.
         It is a bit list of the ::wxPropertySheetDialogFlags values.
     /**
         You can customize the look and feel of the dialog by setting the sheet style.
         It is a bit list of the ::wxPropertySheetDialogFlags values.