Fixed GetIcon to keep up with return type change on all other platforms.

[wxWidgets.git] / src / generic / propdlg.cpp

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index ecbaf34ed363c673a7f18dad14d9b17a152d4d65..352c00b54b77938497b159846a2a0febded1d2bc 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        propdlg.cpp
+// Name:        src/generic/propdlg.cpp
 // Purpose:     wxPropertySheetDialog
 // Author:      Julian Smart
 // Modified by:
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "propdlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -22,6 +18,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_BOOKCTRL
+
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/sizer.h"
@@ -43,20 +41,20 @@ BEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog)
     EVT_ACTIVATE(wxPropertySheetDialog::OnActivate)
 END_EVENT_TABLE()
 
-bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title, 
+bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxString& title,
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {
-    if (!wxDialog::Create(parent, id, title, pos, sz, style, name))
+    if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name))
         return false;
-    
+
     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
     SetSizer(topSizer);
 
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
-    int extraSpace = 5;
+    int extraSpace = 2;
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     extraSpace=0;
 #endif
@@ -79,6 +77,7 @@ void wxPropertySheetDialog::LayoutDialog()
 {
 #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
     GetSizer()->Fit(this);
+    GetSizer()->SetSizeHints(this);
     Centre(wxBOTH);
 #endif
 #if defined(__SMARTPHONE__)
@@ -95,22 +94,25 @@ void wxPropertySheetDialog::CreateButtons(int flags)
     // Perhaps that could be embedded in CreateButtonSizer() directly.
     SetRightMenu(wxID_CANCEL);
     SetLeftMenu(wxID_OK);
+    wxUnusedVar(flags);
 #elif defined(__POCKETPC__)
     // Do nothing
+    wxUnusedVar(flags);
 #else
     wxSizer* sizer = CreateButtonSizer(flags);
-    m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
+    m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2);
+    m_innerSizer->AddSpacer(2);
 #endif
 }
 
 // Creates the book control
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
-    int style = 0;
+    int style = wxCLIP_CHILDREN;
 #if defined(__POCKETPC__) && wxUSE_NOTEBOOK
-    style |= wxNB_BOTTOM|wxNB_FLAT;
+    style |= wxBK_BOTTOM|wxNB_FLAT;
 #else
-    style |= wxBC_DEFAULT;
+    style |= wxBK_DEFAULT;
 #endif
     return new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 }
@@ -137,7 +139,7 @@ void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
     // of the dialog (the choicebook).
     if (event.GetActive())
     {
-        wxChoicebook* choiceBook = wxDynamicCast(GetBookCtrl(), wxChoicebook);     
+        wxChoicebook* choiceBook = wxDynamicCast(GetBookCtrl(), wxChoicebook);
         if (choiceBook)
             choiceBook->SetFocus();
     }
@@ -146,3 +148,4 @@ void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
         event.Skip();
 }
 
+#endif // wxUSE_BOOKCTRL