Putting the SetBestFittingSize() call at the end of wxToolBar::Realize

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

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index d8ee50ab878930e8aee107faa02bb7832a05b94d..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:
 // Purpose:     wxPropertySheetDialog
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,6 +18,8 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_BOOKCTRL
+

 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/sizer.h"
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/sizer.h"


@@ -32,6 +30,7 @@
 
 #include "wx/bookctrl.h"
 #include "wx/generic/propdlg.h"
 
 #include "wx/bookctrl.h"
 #include "wx/generic/propdlg.h"

+#include "wx/sysopt.h"

 
 //-----------------------------------------------------------------------------
 // wxPropertySheetDialog
 
 //-----------------------------------------------------------------------------
 // wxPropertySheetDialog


@@ -43,13 +42,13 @@ BEGIN_EVENT_TABLE(wxPropertySheetDialog, wxDialog)
     EVT_ACTIVATE(wxPropertySheetDialog::OnActivate)
 END_EVENT_TABLE()
 
     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|wxCLIP_CHILDREN, name))
         return false;
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {
     if (!wxDialog::Create(parent, id, title, pos, sz, style|wxCLIP_CHILDREN, name))
         return false;

-    
+

     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
     SetSizer(topSizer);
 
     wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
     SetSizer(topSizer);
 


@@ -91,19 +90,27 @@ void wxPropertySheetDialog::LayoutDialog()
 // Creates the buttons, if any
 void wxPropertySheetDialog::CreateButtons(int flags)
 {
 // 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
 }
 
 #endif
 }
 


@@ -112,9 +119,9 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
     int style = wxCLIP_CHILDREN;
 #if defined(__POCKETPC__) && wxUSE_NOTEBOOK
 {
     int style = wxCLIP_CHILDREN;
 #if defined(__POCKETPC__) && wxUSE_NOTEBOOK

-    style |= wxNB_BOTTOM|wxNB_FLAT;
+    style |= wxBK_BOTTOM|wxNB_FLAT;

 #else
 #else

-    style |= wxBC_DEFAULT;
+    style |= wxBK_DEFAULT;

 #endif
     return new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 }
 #endif
     return new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 }


@@ -141,7 +148,7 @@ void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
     // of the dialog (the choicebook).
     if (event.GetActive())
     {
     // of the dialog (the choicebook).
     if (event.GetActive())
     {

-        wxChoicebook* choiceBook = wxDynamicCast(GetBookCtrl(), wxChoicebook);     
+        wxChoicebook* choiceBook = wxDynamicCast(GetBookCtrl(), wxChoicebook);

         if (choiceBook)
             choiceBook->SetFocus();
     }
         if (choiceBook)
             choiceBook->SetFocus();
     }


@@ -150,3 +157,4 @@ void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
         event.Skip();
 }
 
         event.Skip();
 }
 

+#endif // wxUSE_BOOKCTRL