cleanup - more reformatting; fixed bug introduced in prior commit

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

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 5c7c51b26d063b2d2aac6d62c94f020f6be357f7..cc1fbc59c7e8def2e6687d3fce4b1d84e7c43366 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"
 
@@ -34,6 +30,7 @@
 
 #include "wx/bookctrl.h"
 #include "wx/generic/propdlg.h"
+#include "wx/sysopt.h"
 
 //-----------------------------------------------------------------------------
 // wxPropertySheetDialog
@@ -93,19 +90,27 @@ void wxPropertySheetDialog::LayoutDialog()
 // Creates the buttons, if any
 void wxPropertySheetDialog::CreateButtons(int flags)
 {
-#if defined(__SMARTPHONE__)
-    // TODO: create a right-click menu with all the other IDs available.
-    // 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|wxLEFT|wxRIGHT, 2);
-    m_innerSizer->AddSpacer(2);
+#ifdef __POCKETPC__
+    // keep system option status
+    const wxChar *optionName = wxT("wince.dialog.real-ok-cancel");
+    const int status = wxSystemOptions::GetOptionInt(optionName);
+    wxSystemOptions::SetOption(optionName,0);
+#endif
+
+    wxSizer *buttonSizer = CreateButtonSizer( flags & ButtonSizerFlags );
+    if(buttonSizer->GetChildren().GetCount() > 0 )
+    {
+        m_innerSizer->Add( buttonSizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT|wxRIGHT, 2);
+        m_innerSizer->AddSpacer(2);
+    }
+    else
+    {
+        delete buttonSizer;
+    }
+
+#ifdef __POCKETPC__
+    // restore system option
+    wxSystemOptions::SetOption(optionName,status);
 #endif
 }
 
@@ -114,9 +119,9 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
     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 );
 }