Make the app object be global in case it is run multiple times, such

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

diff --git a/src/generic/propdlg.cpp b/src/generic/propdlg.cpp
index d3bda2d3f3d14c9b43a91630a47cfaeafd24e194..5b1fa5d1d5ca7e512b73dd194fcaad197212cfba 100644 (file)
--- a/src/generic/propdlg.cpp
+++ b/src/generic/propdlg.cpp
@@ -13,11 +13,9 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_BOOKCTRL
 
 #ifndef WX_PRECOMP
 #if wxUSE_BOOKCTRL
 
 #ifndef WX_PRECOMP


@@ -70,11 +68,10 @@ bool wxPropertySheetDialog::Create(wxWindow* parent, wxWindowID id, const wxStri
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 
     // This gives more space around the edges
     m_innerSizer = new wxBoxSizer( wxVERTICAL );
 

-    int extraSpace = 2;

 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)

-    extraSpace=0;
+    m_sheetOuterBorder = 0;

 #endif
 #endif

-    topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, extraSpace);
+    topSizer->Add(m_innerSizer, 1, wxGROW|wxALL, m_sheetOuterBorder);

 
     m_bookCtrl = CreateBookCtrl();
     AddBookCtrl(m_innerSizer);
 
     m_bookCtrl = CreateBookCtrl();
     AddBookCtrl(m_innerSizer);


@@ -87,6 +84,8 @@ void wxPropertySheetDialog::Init()
     m_sheetStyle = wxPROPSHEET_DEFAULT;
     m_innerSizer = NULL;
     m_bookCtrl = NULL;
     m_sheetStyle = wxPROPSHEET_DEFAULT;
     m_innerSizer = NULL;
     m_bookCtrl = NULL;

+    m_sheetOuterBorder = 2;
+    m_sheetInnerBorder = 5;

 }
 
 // Layout the dialog, to be called after pages have been created
 }
 
 // Layout the dialog, to be called after pages have been created


@@ -144,7 +143,7 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 #endif
 
     wxBookCtrlBase* bookCtrl = NULL;
 #endif
 
     wxBookCtrlBase* bookCtrl = NULL;

-    
+

 #if wxUSE_NOTEBOOK
     if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK)
         bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 #if wxUSE_NOTEBOOK
     if (GetSheetStyle() & wxPROPSHEET_NOTEBOOK)
         bookCtrl = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );


@@ -168,10 +167,10 @@ wxBookCtrlBase* wxPropertySheetDialog::CreateBookCtrl()
 #endif
     if (!bookCtrl)
         bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );
 #endif
     if (!bookCtrl)
         bookCtrl = new wxBookCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style );

-    
+

     if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
         bookCtrl->SetFitToCurrentPage(true);
     if (GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT)
         bookCtrl->SetFitToCurrentPage(true);

-    
+

     return bookCtrl;
 }
 
     return bookCtrl;
 }
 


@@ -184,7 +183,7 @@ void wxPropertySheetDialog::AddBookCtrl(wxSizer* sizer)
     int borderSize = -2;
     sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxRIGHT, borderSize );
 #else
     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 );
+    sizer->Add( m_bookCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, m_sheetInnerBorder );

 #endif
 }
 
 #endif
 }
 


@@ -210,7 +209,7 @@ void wxPropertySheetDialog::OnActivate(wxActivateEvent& event)
 void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
 {
     event.Skip();
 void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
 {
     event.Skip();

-    
+

     if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
     {
         int sel = GetBookCtrl()->GetSelection();
     if ((GetSheetStyle() & wxPROPSHEET_SHRINKTOFIT) && GetBookCtrl())
     {
         int sel = GetBookCtrl()->GetSelection();


@@ -227,4 +226,3 @@ void wxPropertySheetDialog::OnIdle(wxIdleEvent& event)
 }
 
 #endif // wxUSE_BOOKCTRL
 }
 
 #endif // wxUSE_BOOKCTRL

-