Removed unnecessary casts

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

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index 90b72aad0ece810dfc12151287aeceaf46eff646..f94ec74a3045e92810faa0e4ce9ab8e7756ea76b 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -30,7 +30,7 @@
     #include "wx/msgdlg.h"
 #endif
 
     #include "wx/msgdlg.h"
 #endif
 

-#include "wx/notebook.h"
+#include "wx/bookctrl.h"

 #include "wx/generic/propdlg.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/generic/propdlg.h"
 
 //-----------------------------------------------------------------------------


@@ -43,6 +43,9 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {
                                        const wxPoint& pos, const wxSize& sz, long style,
                                        const wxString& name)
 {

+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    style = wxNO_BORDER;
+#endif    

     if (!wxDialog::Create(parent, id, title, pos, sz, style, name))
         return false;
     
     if (!wxDialog::Create(parent, id, title, pos, sz, style, name))
         return false;
     


@@ -53,7 +56,7 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
     int extraSpace = 5;
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
     int extraSpace = 5;

-#ifdef __WXWINCE__
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)

     extraSpace=0;
 #endif
     topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
     extraSpace=0;
 #endif
     topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);


@@ -73,7 +76,7 @@ void wxPropertySheetDialog::Init()
 // Layout the dialog, to be called after pages have been created
 void wxPropertySheetDialog::LayoutDialog()
 {
 // Layout the dialog, to be called after pages have been created
 void wxPropertySheetDialog::LayoutDialog()
 {

-#ifndef __WXWINCE__
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     GetSizer()->Fit(this);
     Centre(wxBOTH);
 #endif
     GetSizer()->Fit(this);
     Centre(wxBOTH);
 #endif


@@ -82,7 +85,14 @@ void wxPropertySheetDialog::LayoutDialog()
 // Creates the buttons, if any
 void wxPropertySheetDialog::CreateButtons(int flags)
 {
 // Creates the buttons, if any
 void wxPropertySheetDialog::CreateButtons(int flags)
 {

-#ifndef __WXWINCE__
+#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);
+#elif defined(__POCKETPC__)
+    // Do nothing
+#else

     wxSizer* sizer = CreateButtonSizer(flags);
     m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 #endif
     wxSizer* sizer = CreateButtonSizer(flags);
     m_innerSizer->Add( sizer, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 #endif


@@ -92,19 +102,22 @@ void wxPropertySheetDialog::CreateButtons(int flags)
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
     int style = 0;
 wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 {
     int style = 0;

-#ifdef __WXWINCE__
+#if defined(__POCKETPC__) && wxUSE_NOTEBOOK

     style |= wxNB_BOTTOM|wxNB_FLAT;
     style |= wxNB_BOTTOM|wxNB_FLAT;

+#else
+    style |= wxBC_DEFAULT;

 #endif
 #endif

-    return new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
+    return new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );

 }
 
 // Adds the book control to the inner sizer.
 void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
 {
 }
 
 // Adds the book control to the inner sizer.
 void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
 {

-#ifdef __WXWINCE__
+#if defined(__POCKETPC__) && wxUSE_NOTEBOOK

     // The book control has to be sized larger than the dialog because of a border bug
     // in WinCE
     // The book control has to be sized larger than the dialog because of a border bug
     // in WinCE

-    sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, -3 );
+    int borderSize = -2;
+    sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, borderSize );

 #else
     sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 #endif
 #else
     sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 #endif