ignore clicks on a toolbar but outside any button

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

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index b35a76fb741522e7367ac6fb6e07728e419a3649..fd6901f6627a1c2d026d5bdbd98927305eb944e8 100644 (file)
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -9,27 +9,37 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "proplist.h"
+    #pragma implementation "proplist.h"

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_PROPSHEET
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/window.h"
-#include "wx/font.h"
-#include "wx/button.h"
-#include "wx/bmpbuttn.h"
-#include "wx/textctrl.h"
-#include "wx/listbox.h"
-#include "wx/settings.h"
-#include "wx/msgdlg.h"
-#include "wx/filedlg.h"
+    #include "wx/window.h"
+    #include "wx/font.h"
+    #include "wx/button.h"
+    #include "wx/bmpbuttn.h"
+    #include "wx/textctrl.h"
+    #include "wx/listbox.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
+    #include "wx/filedlg.h"

 #endif
 
 #include "wx/sizer.h"
 #endif
 
 #include "wx/sizer.h"


@@ -44,25 +54,32 @@
 #include <math.h>
 #include <string.h>
 
 #include <math.h>
 #include <string.h>
 

+// ----------------------------------------------------------------------------
+// XPMs
+// ----------------------------------------------------------------------------
+
+// XPM hack: make the arrays const
+#define static static const
+

 #ifndef __WXMSW__
 #ifndef __WXMSW__

-#include "wx/generic/cross.xpm"
-#include "wx/generic/tick.xpm"
+    #include "wx/generic/cross.xpm"
+    #include "wx/generic/tick.xpm"

 #endif
 
 #endif
 

+#undef static

 
 

-/*
- * global data, urgh.
- */
-
-static wxBitmap* gs_tickBitmap = (wxBitmap*) NULL;
-static wxBitmap* gs_crossBitmap = (wxBitmap*) NULL;
+// ----------------------------------------------------------------------------
+// accessor functions for the bitmaps (may return NULL, check for it!)
+// ----------------------------------------------------------------------------

 
 

+static wxBitmap *GetTickBitmap();
+static wxBitmap *GetCrossBitmap();

 
 

-/*
- * Property text edit control
- */
+// ----------------------------------------------------------------------------
+// Property text edit control
+// ----------------------------------------------------------------------------

 
 

-IMPLEMENT_CLASS(wxPropertyTextEdit, wxTextCtrl)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyTextEdit, wxTextCtrl)

 
 wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView *v, wxWindow *parent,
     const wxWindowID id, const wxString& value,
 
 wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView *v, wxWindow *parent,
     const wxWindowID id, const wxString& value,


@@ -73,17 +90,17 @@ wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView *v, wxWindow *parent,
   m_view = v;
 }
 
   m_view = v;
 }
 

-void wxPropertyTextEdit::OnSetFocus(void)
+void wxPropertyTextEdit::OnSetFocus()

 {
 }
 
 {
 }
 

-void wxPropertyTextEdit::OnKillFocus(void)
+void wxPropertyTextEdit::OnKillFocus()

 {
 }
 
 {
 }
 

-/*
- * Property list view
- */
+// ----------------------------------------------------------------------------
+// Property list view
+// ----------------------------------------------------------------------------

 
 bool wxPropertyListView::sm_dialogCancelled = FALSE;
 
 
 bool wxPropertyListView::sm_dialogCancelled = FALSE;
 


@@ -121,7 +138,7 @@ wxPropertyListView::wxPropertyListView(wxPanel *propPanel, long flags):wxPropert
   m_detailedEditing = FALSE;
 }
 
   m_detailedEditing = FALSE;
 }
 

-wxPropertyListView::~wxPropertyListView(void)
+wxPropertyListView::~wxPropertyListView()

 {
 }
 
 {
 }
 


@@ -138,7 +155,7 @@ void wxPropertyListView::ShowView(wxPropertySheet *ps, wxPanel *panel)
 
 // Update this view of the viewed object, called e.g. by
 // the object itself.
 
 // Update this view of the viewed object, called e.g. by
 // the object itself.

-bool wxPropertyListView::OnUpdateView(void)
+bool wxPropertyListView::OnUpdateView()

 {
   return TRUE;
 }
 {
   return TRUE;
 }


@@ -152,7 +169,7 @@ bool wxPropertyListView::UpdatePropertyList(bool clearEditArea)
   if (clearEditArea)
   {
     m_valueList->Clear();
   if (clearEditArea)
   {
     m_valueList->Clear();

-    m_valueText->SetValue("");
+    m_valueText->SetValue(_T(""));

   }
   wxNode *node = m_propertySheet->GetProperties().First();
 
   }
   wxNode *node = m_propertySheet->GetProperties().First();
 


@@ -205,7 +222,7 @@ bool wxPropertyListView::UpdatePropertyDisplayInList(wxProperty *property)
 // Find the wxListBox index corresponding to this property
 int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
 {
 // Find the wxListBox index corresponding to this property
 int wxPropertyListView::FindListIndexForProperty(wxProperty *property)
 {

-  int n = m_propertyScrollingList->Number();
+  int n = m_propertyScrollingList->GetCount();

   for (int i = 0; i < n; i++)
   {
     if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
   for (int i = 0; i < n; i++)
   {
     if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))


@@ -244,7 +261,7 @@ bool wxPropertyListView::ShowProperty(wxProperty *property, bool select)
   }
 
   m_valueList->Clear();
   }
 
   m_valueList->Clear();

-  m_valueText->SetValue("");
+  m_valueText->SetValue(_T(""));

 
   if (property)
   {
 
   if (property)
   {


@@ -299,7 +316,7 @@ bool wxPropertyListView::EndShowingProperty(wxProperty *property)
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxPropertyListView::BeginDetailedEditing(void)
+void wxPropertyListView::BeginDetailedEditing()

 {
   if (!m_currentValidator)
     return;
 {
   if (!m_currentValidator)
     return;


@@ -318,7 +335,7 @@ void wxPropertyListView::BeginDetailedEditing(void)
     m_detailedEditing = TRUE;
 }
 
     m_detailedEditing = TRUE;
 }
 

-void wxPropertyListView::EndDetailedEditing(void)
+void wxPropertyListView::EndDetailedEditing()

 {
   if (!m_currentValidator)
     return;
 {
   if (!m_currentValidator)
     return;


@@ -410,7 +427,7 @@ bool wxPropertyListView::CreateControls()
 {
     wxPanel *panel = (wxPanel *)m_propertyWindow;
 
 {
     wxPanel *panel = (wxPanel *)m_propertyWindow;
 

-    wxSize largeButtonSize( 60, 25 );
+    wxSize largeButtonSize( 70, 25 );

     wxSize smallButtonSize( 23, 23 );
 
     if (m_valueText)
     wxSize smallButtonSize( 23, 23 );
 
     if (m_valueText)


@@ -423,7 +440,9 @@ bool wxPropertyListView::CreateControls()
     wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 
 #ifdef __WXMSW__
     wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 
 #ifdef __WXMSW__

-    wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL, FALSE, "Courier New");
+    wxFont *boringFont =
+        wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN,
+                                        wxNORMAL, wxNORMAL, FALSE, _T("Courier New"));

 #else
     wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxTELETYPE, wxNORMAL, wxNORMAL);
 #endif
 #else
     wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxTELETYPE, wxNORMAL, wxNORMAL);
 #endif


@@ -433,7 +452,7 @@ bool wxPropertyListView::CreateControls()
 //  panel->SetClientData((char *)this);
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
 //  panel->SetClientData((char *)this);
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );

-    
+

     // top row with optional buttons and input line
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL );
     // top row with optional buttons and input line
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxHORIZONTAL );


@@ -441,31 +460,34 @@ bool wxPropertyListView::CreateControls()
 
     if (m_buttonFlags & wxPROP_BUTTON_CHECK_CROSS)
     {
 
     if (m_buttonFlags & wxPROP_BUTTON_CHECK_CROSS)
     {

-        if (gs_tickBitmap && gs_crossBitmap)
+        wxBitmap *tickBitmap = GetTickBitmap();
+        wxBitmap *crossBitmap = GetCrossBitmap();
+
+        if ( tickBitmap && crossBitmap )

         {
         {

-            m_confirmButton = new wxBitmapButton(panel, wxID_PROP_CHECK, *gs_tickBitmap, wxPoint(-1, -1), smallButtonSize );
-            m_cancelButton = new wxBitmapButton(panel, wxID_PROP_CROSS, *gs_crossBitmap, wxPoint(-1, -1), smallButtonSize );
+            m_confirmButton = new wxBitmapButton(panel, wxID_PROP_CHECK, *tickBitmap, wxPoint(-1, -1), smallButtonSize );
+            m_cancelButton = new wxBitmapButton(panel, wxID_PROP_CROSS, *crossBitmap, wxPoint(-1, -1), smallButtonSize );

         }
         else
         {
         }
         else
         {

-            m_confirmButton = new wxButton(panel, wxID_PROP_CHECK, ":-)", wxPoint(-1, -1), smallButtonSize );
-           m_cancelButton = new wxButton(panel, wxID_PROP_CROSS, "X", wxPoint(-1, -1), smallButtonSize );
+            m_confirmButton = new wxButton(panel, wxID_PROP_CHECK, _T(":-)"), wxPoint(-1, -1), smallButtonSize );
+            m_cancelButton = new wxButton(panel, wxID_PROP_CROSS, _T("X"), wxPoint(-1, -1), smallButtonSize );

         }
         }

-       
-       topsizer->Add( m_confirmButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
-       topsizer->Add( m_cancelButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
+
+        topsizer->Add( m_confirmButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
+        topsizer->Add( m_cancelButton, 0, wxLEFT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );

     }
 
     }
 

-    m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, "", 
+    m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, _T(""),

        wxPoint(-1, -1), wxSize(-1, smallButtonSize.y), wxPROCESS_ENTER);
     m_valueText->Enable(FALSE);
     topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );
        wxPoint(-1, -1), wxSize(-1, smallButtonSize.y), wxPROCESS_ENTER);
     m_valueText->Enable(FALSE);
     topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );

-    
+

     if (m_buttonFlags & wxPROP_PULLDOWN)
     {
     if (m_buttonFlags & wxPROP_PULLDOWN)
     {

-        m_editButton = new wxButton(panel, wxID_PROP_EDIT, "...",  wxPoint(-1, -1), smallButtonSize);
+        m_editButton = new wxButton(panel, wxID_PROP_EDIT, _T("..."),  wxPoint(-1, -1), smallButtonSize);

         m_editButton->Enable(FALSE);
         m_editButton->Enable(FALSE);

-       topsizer->Add( m_editButton, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );
+        topsizer->Add( m_editButton, 0, wxRIGHT|wxTOP|wxBOTTOM | wxEXPAND, buttonborder );

     }
 
     mainsizer->Add( topsizer, 0, wxEXPAND );
     }
 
     mainsizer->Add( topsizer, 0, wxEXPAND );


@@ -481,24 +503,24 @@ bool wxPropertyListView::CreateControls()
     m_propertyScrollingList->SetFont(* boringFont);
     m_middleSizer->Add( m_propertyScrollingList, 1, wxALL|wxEXPAND, buttonborder );
 
     m_propertyScrollingList->SetFont(* boringFont);
     m_middleSizer->Add( m_propertyScrollingList, 1, wxALL|wxEXPAND, buttonborder );
 

-    mainsizer->Add( m_middleSizer, 1, wxEXPAND );    
+    mainsizer->Add( m_middleSizer, 1, wxEXPAND );

 
     // bottom row with buttons
 
     if ((m_buttonFlags & wxPROP_BUTTON_OK) ||
         (m_buttonFlags & wxPROP_BUTTON_CLOSE) ||
 
     // bottom row with buttons
 
     if ((m_buttonFlags & wxPROP_BUTTON_OK) ||
         (m_buttonFlags & wxPROP_BUTTON_CLOSE) ||

-       (m_buttonFlags & wxPROP_BUTTON_CANCEL) ||
-       (m_buttonFlags & wxPROP_BUTTON_HELP))
+        (m_buttonFlags & wxPROP_BUTTON_CANCEL) ||
+        (m_buttonFlags & wxPROP_BUTTON_HELP))

     {
         wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
         buttonborder = 5;
     {
         wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
         buttonborder = 5;

-    
+

         if (m_buttonFlags & wxPROP_BUTTON_OK)
         {
             m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxPoint(-1, -1), largeButtonSize );
             m_windowCloseButton->SetDefault();
             m_windowCloseButton->SetFocus();
         if (m_buttonFlags & wxPROP_BUTTON_OK)
         {
             m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxPoint(-1, -1), largeButtonSize );
             m_windowCloseButton->SetDefault();
             m_windowCloseButton->SetFocus();

-            bottomsizer->Add( m_windowCloseButton, 0, wxLEFT|wxTOP|wxBOTTOM, buttonborder );
+            bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );

         }
         else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
         {
         }
         else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
         {


@@ -515,8 +537,8 @@ bool wxPropertyListView::CreateControls()
             m_windowHelpButton = new wxButton(panel, wxID_HELP, _("Help"), wxPoint(-1, -1), largeButtonSize );
             bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
         }
             m_windowHelpButton = new wxButton(panel, wxID_HELP, _("Help"), wxPoint(-1, -1), largeButtonSize );
             bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
         }

-       
-        mainsizer->Add( bottomsizer, 1, wxALIGN_RIGHT | wxEXPAND );
+
+        mainsizer->Add( bottomsizer, 0, wxALIGN_RIGHT | wxEXPAND );

     }
 
     panel->SetSizer( mainsizer );
     }
 
     panel->SetSizer( mainsizer );


@@ -533,16 +555,16 @@ void wxPropertyListView::ShowTextControl(bool show)
 void wxPropertyListView::ShowListBoxControl(bool show)
 {
     if (!m_valueList) return;
 void wxPropertyListView::ShowListBoxControl(bool show)
 {
     if (!m_valueList) return;

-    
+

     m_valueList->Show(show);
     m_valueList->Show(show);

-    
+

     if (m_buttonFlags & wxPROP_DYNAMIC_VALUE_FIELD)
     {
         if (show)
     if (m_buttonFlags & wxPROP_DYNAMIC_VALUE_FIELD)
     {
         if (show)

-           m_middleSizer->Prepend( m_valueList, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 3 );
-       else
-           m_middleSizer->Remove( 0 );
-      
+            m_middleSizer->Prepend( m_valueList, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 3 );
+        else
+            m_middleSizer->Remove( 0 );
+

         m_propertyWindow->Layout();
     }
 }
         m_propertyWindow->Layout();
     }
 }


@@ -559,7 +581,7 @@ void wxPropertyListView::EnableCross(bool show)
     m_cancelButton->Enable(show);
 }
 
     m_cancelButton->Enable(show);
 }
 

-bool wxPropertyListView::OnClose(void)
+bool wxPropertyListView::OnClose()

 {
   // Retrieve the value if any
   wxCommandEvent event;
 {
   // Retrieve the value if any
   wxCommandEvent event;


@@ -658,11 +680,11 @@ void wxPropertyListView::OnText(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-/*
- * Property dialog box
- */
+// ----------------------------------------------------------------------------
+// Property dialog box
+// ----------------------------------------------------------------------------

 
 

-IMPLEMENT_CLASS(wxPropertyListDialog, wxDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListDialog, wxDialog)

 
 BEGIN_EVENT_TABLE(wxPropertyListDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL,                wxPropertyListDialog::OnCancel)
 
 BEGIN_EVENT_TABLE(wxPropertyListDialog, wxDialog)
     EVT_BUTTON(wxID_CANCEL,                wxPropertyListDialog::OnCancel)


@@ -718,11 +740,11 @@ bool wxPropertyListDialog::ProcessEvent(wxEvent& event)
         return TRUE;
 }
 
         return TRUE;
 }
 

-/*
- * Property panel
- */
+// ----------------------------------------------------------------------------
+// Property panel
+// ----------------------------------------------------------------------------

 
 

-IMPLEMENT_CLASS(wxPropertyListPanel, wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListPanel, wxPanel)

 
 BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
     EVT_SIZE(wxPropertyListPanel::OnSize)
 
 BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
     EVT_SIZE(wxPropertyListPanel::OnSize)


@@ -754,11 +776,11 @@ void wxPropertyListPanel::OnSize(wxSizeEvent& WXUNUSED(event))
     Layout();
 }
 
     Layout();
 }
 

-/*
- * Property frame
- */
+// ----------------------------------------------------------------------------
+// Property frame
+// ----------------------------------------------------------------------------

 
 

-IMPLEMENT_CLASS(wxPropertyListFrame, wxFrame)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListFrame, wxFrame)

 
 BEGIN_EVENT_TABLE(wxPropertyListFrame, wxFrame)
     EVT_CLOSE(wxPropertyListFrame::OnCloseWindow)
 
 BEGIN_EVENT_TABLE(wxPropertyListFrame, wxFrame)
     EVT_CLOSE(wxPropertyListFrame::OnCloseWindow)


@@ -785,7 +807,7 @@ wxPropertyListPanel *wxPropertyListFrame::OnCreatePanel(wxFrame *parent, wxPrope
   return new wxPropertyListPanel(v, parent);
 }
 
   return new wxPropertyListPanel(v, parent);
 }
 

-bool wxPropertyListFrame::Initialize(void)
+bool wxPropertyListFrame::Initialize()

 {
   m_propertyPanel = OnCreatePanel(this, m_view);
   if (m_propertyPanel)
 {
   m_propertyPanel = OnCreatePanel(this, m_view);
   if (m_propertyPanel)


@@ -799,9 +821,9 @@ bool wxPropertyListFrame::Initialize(void)
     return FALSE;
 }
 
     return FALSE;
 }
 

- /*
-  * Property list specific validator
-  */
+// ----------------------------------------------------------------------------
+// Property list specific validator
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxPropertyListValidator, wxPropertyValidator)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxPropertyListValidator, wxPropertyValidator)
 


@@ -817,7 +839,7 @@ bool wxPropertyListValidator::OnSelect(bool select, wxProperty *property, wxProp
 bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   wxString s(view->GetValueList()->GetStringSelection());
 bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
 {
   wxString s(view->GetValueList()->GetStringSelection());

-  if (s != _T(""))
+  if (s != wxT(""))

   {
     view->GetValueText()->SetValue(s);
     view->RetrieveProperty(property);
   {
     view->GetValueText()->SetValue(s);
     view->RetrieveProperty(property);


@@ -863,9 +885,9 @@ bool wxPropertyListValidator::OnClearControls(wxProperty *WXUNUSED(property), wx
   return TRUE;
 }
 
   return TRUE;
 }
 

-/*
- * Default validators
- */
+// ----------------------------------------------------------------------------
+// Default validators
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS(wxRealListValidator, wxPropertyListValidator)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxRealListValidator, wxPropertyListValidator)
 


@@ -885,8 +907,8 @@ bool wxRealListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropert
   if (!StringToFloat(WXSTRINGCAST value, &val))
   {
     wxChar buf[200];
   if (!StringToFloat(WXSTRINGCAST value, &val))
   {
     wxChar buf[200];

-    wxSprintf(buf, _T("Value %s is not a valid real number!"), value.GetData());
-    wxMessageBox(buf, _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxSprintf(buf, wxT("Value %s is not a valid real number!"), value.GetData());
+    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);

     return FALSE;
   }
 
     return FALSE;
   }
 


@@ -948,15 +970,15 @@ bool wxIntegerListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxProp
   if (!StringToLong(WXSTRINGCAST value, &val))
   {
     wxChar buf[200];
   if (!StringToLong(WXSTRINGCAST value, &val))
   {
     wxChar buf[200];

-    wxSprintf(buf, _T("Value %s is not a valid integer!"), value.GetData());
-    wxMessageBox(buf, _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxSprintf(buf, wxT("Value %s is not a valid integer!"), value.GetData());
+    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);

     return FALSE;
   }
   if (val < m_integerMin || val > m_integerMax)
   {
     wxChar buf[200];
     return FALSE;
   }
   if (val < m_integerMin || val > m_integerMax)
   {
     wxChar buf[200];

-    wxSprintf(buf, _T("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
-    wxMessageBox(buf, _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxSprintf(buf, wxT("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
+    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);

     return FALSE;
   }
   return TRUE;
     return FALSE;
   }
   return TRUE;


@@ -1002,9 +1024,9 @@ bool wxBoolListValidator::OnCheckValue(wxProperty *WXUNUSED(property), wxPropert
   if (!view->GetValueText())
     return FALSE;
   wxString value(view->GetValueText()->GetValue());
   if (!view->GetValueText())
     return FALSE;
   wxString value(view->GetValueText()->GetValue());

-  if (value != _T("True") && value != _T("False"))
+  if (value != wxT("True") && value != wxT("False"))

   {
   {

-    wxMessageBox(_T("Value must be True or False!"), _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxMessageBox(wxT("Value must be True or False!"), wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);

     return FALSE;
   }
   return TRUE;
     return FALSE;
   }
   return TRUE;


@@ -1023,7 +1045,7 @@ bool wxBoolListValidator::OnRetrieveValue(wxProperty *property, wxPropertyListVi
 
   wxString value(view->GetValueText()->GetValue());
   bool boolValue = FALSE;
 
   wxString value(view->GetValueText()->GetValue());
   bool boolValue = FALSE;

-  if (value == _T("True"))
+  if (value == wxT("True"))

     boolValue = TRUE;
   else
     boolValue = FALSE;
     boolValue = TRUE;
   else
     boolValue = FALSE;


@@ -1066,8 +1088,8 @@ bool wxBoolListValidator::OnPrepareDetailControls(wxProperty *WXUNUSED(property)
     view->ShowListBoxControl(TRUE);
     view->GetValueList()->Enable(TRUE);
 
     view->ShowListBoxControl(TRUE);
     view->GetValueList()->Enable(TRUE);
 

-    view->GetValueList()->Append(_T("True"));
-    view->GetValueList()->Append(_T("False"));
+    view->GetValueList()->Append(wxT("True"));
+    view->GetValueList()->Append(wxT("False"));

     wxChar *currentString = copystring(view->GetValueText()->GetValue());
     view->GetValueList()->SetStringSelection(currentString);
     delete[] currentString;
     wxChar *currentString = copystring(view->GetValueText()->GetValue());
     view->GetValueList()->SetStringSelection(currentString);
     delete[] currentString;


@@ -1157,7 +1179,7 @@ bool wxStringListValidator::OnDisplayValue(wxProperty *property, wxPropertyListV
     return FALSE;
   wxString str(property->GetValue().GetStringRepresentation());
   view->GetValueText()->SetValue(str);
     return FALSE;
   wxString str(property->GetValue().GetStringRepresentation());
   view->GetValueText()->SetValue(str);

-  if (m_strings && view->GetValueList() && view->GetValueList()->IsShown() && view->GetValueList()->Number() > 0)
+  if (m_strings && view->GetValueList() && view->GetValueList()->IsShown() && view->GetValueList()->GetCount() > 0)

   {
     view->GetValueList()->SetStringSelection(str);
   }
   {
     view->GetValueList()->SetStringSelection(str);
   }


@@ -1271,7 +1293,7 @@ wxFilenameListValidator::wxFilenameListValidator(wxString message , wxString wil
 {
 }
 
 {
 }
 

-wxFilenameListValidator::~wxFilenameListValidator(void)
+wxFilenameListValidator::~wxFilenameListValidator()

 {
 }
 
 {
 }
 


@@ -1340,7 +1362,7 @@ void wxFilenameListValidator::OnEdit(wxProperty *property, wxPropertyListView *v
      m_filenameWildCard.GetData(),
      0,
      parentWindow);
      m_filenameWildCard.GetData(),
      0,
      parentWindow);

-  if (s != _T(""))
+  if (s != wxT(""))

   {
     property->GetValue() = s;
     view->DisplayProperty(property);
   {
     property->GetValue() = s;
     view->DisplayProperty(property);


@@ -1359,7 +1381,7 @@ wxColourListValidator::wxColourListValidator(long flags):
 {
 }
 
 {
 }
 

-wxColourListValidator::~wxColourListValidator(void)
+wxColourListValidator::~wxColourListValidator()

 {
 }
 
 {
 }
 


@@ -1533,7 +1555,7 @@ void wxListOfStringsListValidator::OnEdit(wxProperty *property, wxPropertyListVi
     expr = expr->GetNext();
   }
 
     expr = expr->GetNext();
   }
 

-  wxString title(_T("Editing "));
+  wxString title(wxT("Editing "));

   title += property->GetName();
 
   if (EditStringList(parentWindow, stringList, title.GetData()))
   title += property->GetName();
 
   if (EditStringList(parentWindow, stringList, title.GetData()))


@@ -1615,7 +1637,7 @@ class wxPropertyStringListEditorText: public wxTextCtrl
      wxTextCtrl(parent, id, val, pos, size, windowStyle, wxDefaultValidator, name)
   {
   }
      wxTextCtrl(parent, id, val, pos, size, windowStyle, wxDefaultValidator, name)
   {
   }

-  void OnKillFocus(void)
+  void OnKillFocus()

   {
     wxPropertyStringListEditorDialog *dialog = (wxPropertyStringListEditorDialog *)GetParent();
     dialog->SaveCurrentSelection();
   {
     wxPropertyStringListEditorDialog *dialog = (wxPropertyStringListEditorDialog *)GetParent();
     dialog->SaveCurrentSelection();


@@ -1746,14 +1768,14 @@ void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& WXUNUSED(event))
   delete[] (wxChar *)node->Data();
   delete node;
   m_currentSelection = -1;
   delete[] (wxChar *)node->Data();
   delete node;
   m_currentSelection = -1;

-  m_stringText->SetValue("");
+  m_stringText->SetValue(_T(""));

 }
 
 void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
 {
   SaveCurrentSelection();
 
 }
 
 void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
 {
   SaveCurrentSelection();
 

-  wxChar *initialText = _T("");
+  wxString initialText;

   wxNode *node = m_stringList->Add(initialText);
   m_listBox->Append(initialText, (void *)node);
   m_currentSelection = m_stringList->Number() - 1;
   wxNode *node = m_stringList->Add(initialText);
   m_listBox->Append(initialText, (void *)node);
   m_currentSelection = m_stringList->Number() - 1;


@@ -1786,13 +1808,15 @@ void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent& event)
+void
+wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
   SaveCurrentSelection();
 {
   SaveCurrentSelection();

-  this->Destroy();
+
+  Destroy();

 }
 
 }
 

-void wxPropertyStringListEditorDialog::SaveCurrentSelection(void)
+void wxPropertyStringListEditorDialog::SaveCurrentSelection()

 {
   if (m_currentSelection == -1)
     return;
 {
   if (m_currentSelection == -1)
     return;


@@ -1809,11 +1833,11 @@ void wxPropertyStringListEditorDialog::SaveCurrentSelection(void)
   m_listBox->SetString(m_currentSelection, (char *)node->Data());
 }
 
   m_listBox->SetString(m_currentSelection, (char *)node->Data());
 }
 

-void wxPropertyStringListEditorDialog::ShowCurrentSelection(void)
+void wxPropertyStringListEditorDialog::ShowCurrentSelection()

 {
   if (m_currentSelection == -1)
   {
 {
   if (m_currentSelection == -1)
   {

-    m_stringText->SetValue("");
+    m_stringText->SetValue(_T(""));

     return;
   }
   wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(m_currentSelection);
     return;
   }
   wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(m_currentSelection);


@@ -1822,47 +1846,47 @@ void wxPropertyStringListEditorDialog::ShowCurrentSelection(void)
   m_stringText->Enable(TRUE);
 }
 
   m_stringText->Enable(TRUE);
 }
 

-//-----------------------------------------------------------------------------
-// wxPropertyModule
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------

 
 

-class wxPropertyModule: public wxModule
+// FIXME MT-UNSAFE
+static wxBitmap *GetTickBitmap()

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPropertyModule)
-
-public:
-    wxPropertyModule() {}
-    bool OnInit();
-    void OnExit();
-};
+    static wxBitmap* s_tickBitmap = (wxBitmap *) NULL;
+    static bool s_loaded = FALSE;

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxPropertyModule,wxModule)
-
-bool wxPropertyModule::OnInit()
-{
-#ifdef __WXMSW__
-    gs_tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
-    gs_crossBitmap =  new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
-#else
-    gs_tickBitmap = new wxBitmap( tick_xpm );
-    gs_crossBitmap =  new wxBitmap( cross_xpm );
-#endif
-    if (!gs_tickBitmap || !gs_crossBitmap || !gs_tickBitmap->Ok() || !gs_crossBitmap->Ok())
+    if ( !s_loaded )

     {
     {

-        if (gs_tickBitmap) delete gs_tickBitmap;
-       if (gs_crossBitmap) delete gs_crossBitmap;
-       gs_tickBitmap = (wxBitmap*) NULL;
-       gs_crossBitmap = (wxBitmap*) NULL;
+        s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
+
+        #if defined(__WXMSW__) || defined(__WXPM__)
+            s_tickBitmap = new wxBitmap(_T("tick_bmp"), wxBITMAP_TYPE_RESOURCE);
+        #else
+            s_tickBitmap = new wxBitmap( tick_xpm );
+        #endif

     }
 
     }
 

-    return TRUE;
+    return s_tickBitmap;

 }
 
 }
 

-void wxPropertyModule::OnExit()
+static wxBitmap *GetCrossBitmap()

 {
 {

-    if (gs_tickBitmap)
-        delete gs_tickBitmap;
-    if (gs_crossBitmap)
-        delete gs_crossBitmap;
+    static wxBitmap* s_crossBitmap = (wxBitmap *) NULL;
+    static bool s_loaded = FALSE;
+
+    if ( !s_loaded )
+    {
+        s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
+
+        #if defined(__WXMSW__) || defined(__WXPM__)
+            s_crossBitmap =  new wxBitmap(_T("cross_bmp"), wxBITMAP_TYPE_RESOURCE);
+        #else // XPMs
+            s_crossBitmap =  new wxBitmap( cross_xpm );
+        #endif // BMPs/XPMs
+    }
+
+    return s_crossBitmap;

 }
 
 }
 

+#endif // wxUSE_PROPSHEET