no real change: just rename "near" into "onNearPart" (MSVC doesn't like 'near' as...

[wxWidgets.git] / src / propgrid / advprops.cpp

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 2bb5d600bcf061fed11c4856fcb0ad83a06fb4a2..ba05073f6bfa0641b4a4873aa9a383a3c1a4fb3e 100644 (file)
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -62,6 +62,8 @@
     #include "wx/msw/dc.h"
 #endif
 
     #include "wx/msw/dc.h"
 #endif
 

+#include "wx/odcombo.h"
+

 // -----------------------------------------------------------------------
 
 #if defined(__WXMSW__)
 // -----------------------------------------------------------------------
 
 #if defined(__WXMSW__)


@@ -274,11 +276,12 @@ wxPGWindowList wxPGSpinCtrlEditor::CreateControls( wxPropertyGrid* propgrid, wxP
     wnd2->SetRange( INT_MIN, INT_MAX );
     wnd2->SetValue( 0 );
 
     wnd2->SetRange( INT_MIN, INT_MAX );
     wnd2->SetValue( 0 );
 

+    wxWindow* wnd1 = wxPGTextCtrlEditor::CreateControls(propgrid, property, pos, tcSz).m_primary;
+#if wxUSE_VALIDATORS

     // Let's add validator to make sure only numbers can be entered
     wxTextValidator validator(wxFILTER_NUMERIC, &m_tempString);
     // Let's add validator to make sure only numbers can be entered
     wxTextValidator validator(wxFILTER_NUMERIC, &m_tempString);

-
-    wxTextCtrl* wnd1 = (wxTextCtrl*) wxPGTextCtrlEditor::CreateControls( propgrid, property, pos, tcSz ).m_primary;

     wnd1->SetValidator(validator);
     wnd1->SetValidator(validator);

+#endif

 
     return wxPGWindowList(wnd1, wnd2);
 }
 
     return wxPGWindowList(wnd1, wnd2);
 }


@@ -552,40 +555,46 @@ void wxPGDatePickerCtrlEditor::SetValueToUnspecified( wxPGProperty* property,
 #include "wx/fontdlg.h"
 #include "wx/fontenum.h"
 
 #include "wx/fontdlg.h"
 #include "wx/fontenum.h"
 

-static const wxChar* gs_fp_es_family_labels[] = {
+//
+// NB: Do not use wxS here since unlike wxT it doesn't translate to wxChar*
+//
+
+static const wxChar* const gs_fp_es_family_labels[] = {

     wxT("Default"), wxT("Decorative"),
     wxT("Roman"), wxT("Script"),
     wxT("Swiss"), wxT("Modern"),
     wxT("Default"), wxT("Decorative"),
     wxT("Roman"), wxT("Script"),
     wxT("Swiss"), wxT("Modern"),

+    wxT("Teletype"), wxT("Unknown"),

     (const wxChar*) NULL
 };
 
     (const wxChar*) NULL
 };
 

-static long gs_fp_es_family_values[] = {
-    wxDEFAULT, wxDECORATIVE,
-    wxROMAN, wxSCRIPT,
-    wxSWISS, wxMODERN
+static const long gs_fp_es_family_values[] = {
+    wxFONTFAMILY_DEFAULT, wxFONTFAMILY_DECORATIVE,
+    wxFONTFAMILY_ROMAN, wxFONTFAMILY_SCRIPT,
+    wxFONTFAMILY_SWISS, wxFONTFAMILY_MODERN,
+    wxFONTFAMILY_TELETYPE, wxFONTFAMILY_UNKNOWN

 };
 
 };
 

-static const wxChar* gs_fp_es_style_labels[] = {
+static const wxChar* const gs_fp_es_style_labels[] = {

     wxT("Normal"),
     wxT("Slant"),
     wxT("Italic"),
     (const wxChar*) NULL
 };
 
     wxT("Normal"),
     wxT("Slant"),
     wxT("Italic"),
     (const wxChar*) NULL
 };
 

-static long gs_fp_es_style_values[] = {
+static const long gs_fp_es_style_values[] = {

     wxNORMAL,
     wxSLANT,
     wxITALIC
 };
 
     wxNORMAL,
     wxSLANT,
     wxITALIC
 };
 

-static const wxChar* gs_fp_es_weight_labels[] = {
+static const wxChar* const gs_fp_es_weight_labels[] = {

     wxT("Normal"),
     wxT("Light"),
     wxT("Bold"),
     (const wxChar*) NULL
 };
 
     wxT("Normal"),
     wxT("Light"),
     wxT("Bold"),
     (const wxChar*) NULL
 };
 

-static long gs_fp_es_weight_values[] = {
+static const long gs_fp_es_weight_values[] = {

     wxNORMAL,
     wxLIGHT,
     wxBOLD
     wxNORMAL,
     wxLIGHT,
     wxBOLD


@@ -622,10 +631,6 @@ wxFontProperty::wxFontProperty( const wxString& label, const wxString& name,
     AddPrivateChild( new wxIntProperty( _("Point Size"),
                      wxS("Point Size"),(long)font.GetPointSize() ) );
 
     AddPrivateChild( new wxIntProperty( _("Point Size"),
                      wxS("Point Size"),(long)font.GetPointSize() ) );
 

-    AddPrivateChild( new wxEnumProperty(_("Family"), wxS("PointSize"),
-                     gs_fp_es_family_labels,gs_fp_es_family_values,
-                     font.GetFamily()) );
-

     wxString faceName = font.GetFaceName();
     // If font was not in there, add it now
     if ( faceName.length() &&
     wxString faceName = font.GetFaceName();
     // If font was not in there, add it now
     if ( faceName.length() &&


@@ -649,6 +654,10 @@ wxFontProperty::wxFontProperty( const wxString& label, const wxString& name,
 
     AddPrivateChild( new wxBoolProperty(_("Underlined"), wxS("Underlined"),
                      font.GetUnderlined()) );
 
     AddPrivateChild( new wxBoolProperty(_("Underlined"), wxS("Underlined"),
                      font.GetUnderlined()) );

+
+    AddPrivateChild( new wxEnumProperty(_("Family"), wxS("PointSize"),
+                     gs_fp_es_family_labels,gs_fp_es_family_values,
+                     font.GetFamily()) );

 }
 
 wxFontProperty::~wxFontProperty() { }
 }
 
 wxFontProperty::~wxFontProperty() { }


@@ -680,7 +689,10 @@ bool wxFontProperty::OnEvent( wxPropertyGrid* propgrid, wxWindow* WXUNUSED(prima
 
         wxFontData data;
         wxFont font;
 
         wxFontData data;
         wxFont font;

-        font << useValue;
+
+        if ( useValue.GetType() == wxS("wxFont") )
+            font << useValue;
+

         data.SetInitialFont( font );
         data.SetColour(*wxBLACK);
 
         data.SetInitialFont( font );
         data.SetColour(*wxBLACK);
 


@@ -704,11 +716,11 @@ void wxFontProperty::RefreshChildren()
     wxFont font;
     font << m_value;
     Item(0)->SetValue( (long)font.GetPointSize() );
     wxFont font;
     font << m_value;
     Item(0)->SetValue( (long)font.GetPointSize() );

-    Item(1)->SetValue( (long)font.GetFamily() );
-    Item(2)->SetValueFromString( font.GetFaceName(), wxPG_FULL_VALUE );
-    Item(3)->SetValue( (long)font.GetStyle() );
-    Item(4)->SetValue( (long)font.GetWeight() );
-    Item(5)->SetValue( font.GetUnderlined() );
+    Item(1)->SetValueFromString( font.GetFaceName(), wxPG_FULL_VALUE );
+    Item(2)->SetValue( (long)font.GetStyle() );
+    Item(3)->SetValue( (long)font.GetWeight() );
+    Item(4)->SetValue( font.GetUnderlined() );
+    Item(5)->SetValue( (long)font.GetFamily() );

 }
 
 wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,
 }
 
 wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,


@@ -723,14 +735,6 @@ wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,
         font.SetPointSize( childValue.GetLong() );
     }
     else if ( ind == 1 )
         font.SetPointSize( childValue.GetLong() );
     }
     else if ( ind == 1 )

-    {
-        int fam = childValue.GetLong();
-        if ( fam < wxDEFAULT ||
-             fam > wxTELETYPE )
-             fam = wxDEFAULT;
-        font.SetFamily( fam );
-    }
-    else if ( ind == 2 )

     {
         wxString faceName;
         int faceIndex = childValue.GetLong();
     {
         wxString faceName;
         int faceIndex = childValue.GetLong();


@@ -740,7 +744,7 @@ wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,
 
         font.SetFaceName( faceName );
     }
 
         font.SetFaceName( faceName );
     }

-    else if ( ind == 3 )
+    else if ( ind == 2 )

     {
         int st = childValue.GetLong();
         if ( st != wxFONTSTYLE_NORMAL &&
     {
         int st = childValue.GetLong();
         if ( st != wxFONTSTYLE_NORMAL &&


@@ -749,7 +753,7 @@ wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,
              st = wxFONTWEIGHT_NORMAL;
         font.SetStyle( st );
     }
              st = wxFONTWEIGHT_NORMAL;
         font.SetStyle( st );
     }

-    else if ( ind == 4 )
+    else if ( ind == 3 )

     {
         int wt = childValue.GetLong();
         if ( wt != wxFONTWEIGHT_NORMAL &&
     {
         int wt = childValue.GetLong();
         if ( wt != wxFONTWEIGHT_NORMAL &&


@@ -758,10 +762,18 @@ wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,
              wt = wxFONTWEIGHT_NORMAL;
         font.SetWeight( wt );
     }
              wt = wxFONTWEIGHT_NORMAL;
         font.SetWeight( wt );
     }

-    else if ( ind == 5 )
+    else if ( ind == 4 )

     {
         font.SetUnderlined( childValue.GetBool() );
     }
     {
         font.SetUnderlined( childValue.GetBool() );
     }

+    else if ( ind == 5 )
+    {
+        int fam = childValue.GetLong();
+        if ( fam < wxDEFAULT ||
+             fam > wxTELETYPE )
+             fam = wxDEFAULT;
+        font.SetFamily( fam );
+    }

 
     wxVariant newVariant;
     newVariant << font;
 
     wxVariant newVariant;
     newVariant << font;


@@ -822,7 +834,7 @@ void wxFontProperty::OnCustomPaint(wxDC& dc,
 #include "wx/colordlg.h"
 
 //#define wx_cp_es_syscolours_len 25
 #include "wx/colordlg.h"
 
 //#define wx_cp_es_syscolours_len 25

-static const wxChar* gs_cp_es_syscolour_labels[] = {
+static const wxChar* const gs_cp_es_syscolour_labels[] = {

     wxT("AppWorkspace"),
     wxT("ActiveBorder"),
     wxT("ActiveCaption"),
     wxT("AppWorkspace"),
     wxT("ActiveBorder"),
     wxT("ActiveCaption"),


@@ -851,7 +863,7 @@ static const wxChar* gs_cp_es_syscolour_labels[] = {
     (const wxChar*) NULL
 };
 
     (const wxChar*) NULL
 };
 

-static long gs_cp_es_syscolour_values[] = {
+static const long gs_cp_es_syscolour_values[] = {

     wxSYS_COLOUR_APPWORKSPACE,
     wxSYS_COLOUR_ACTIVEBORDER,
     wxSYS_COLOUR_ACTIVECAPTION,
     wxSYS_COLOUR_APPWORKSPACE,
     wxSYS_COLOUR_ACTIVEBORDER,
     wxSYS_COLOUR_ACTIVECAPTION,


@@ -925,7 +937,7 @@ wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxS
 
 
 wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxString& name,
 
 
 wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxString& name,

-    const wxChar** labels, const long* values, wxPGChoices* choicesCache,
+    const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,

     const wxColourPropertyValue& value )
     : wxEnumProperty( label, name, labels, values, choicesCache )
 {
     const wxColourPropertyValue& value )
     : wxEnumProperty( label, name, labels, values, choicesCache )
 {


@@ -937,7 +949,7 @@ wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxS
 
 
 wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxString& name,
 
 
 wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxString& name,

-    const wxChar** labels, const long* values, wxPGChoices* choicesCache,
+    const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,

     const wxColour& value )
     : wxEnumProperty( label, name, labels, values, choicesCache )
 {
     const wxColour& value )
     : wxEnumProperty( label, name, labels, values, choicesCache )
 {


@@ -1250,19 +1262,29 @@ bool wxSystemColourProperty::OnEvent( wxPropertyGrid* propgrid,
 
     if ( propgrid->IsMainButtonEvent(event) )
     {
 
     if ( propgrid->IsMainButtonEvent(event) )
     {

+        // We need to handle button click in case editor has been
+        // switched to one that has wxButton as well.

         askColour = true;
     }
     else if ( event.GetEventType() == wxEVT_COMMAND_COMBOBOX_SELECTED )
     {
         askColour = true;
     }
     else if ( event.GetEventType() == wxEVT_COMMAND_COMBOBOX_SELECTED )
     {

-        if ( GetIndex() == GetCustomColourIndex() &&
-             !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
-            askColour = true;
+        // Must override index detection since at this point GetIndex()
+        // will return old value.
+        wxOwnerDrawnComboBox* cb =
+            static_cast<wxOwnerDrawnComboBox*>(propgrid->GetEditorControl());
+
+        if ( cb )
+        {
+            int index = cb->GetSelection();
+
+            if ( index == GetCustomColourIndex() &&
+                    !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
+                askColour = true;
+        }

     }
 
     }
 

-    if ( askColour )
+    if ( askColour && !propgrid->WasValueChangedInEvent() )

     {
     {

-        // We need to handle button click in case editor has been
-        // switched to one that has wxButton as well.

         wxVariant variant;
         if ( QueryColourFromUser(variant) )
             return true;
         wxVariant variant;
         if ( QueryColourFromUser(variant) )
             return true;


@@ -1473,7 +1495,7 @@ bool wxSystemColourProperty::DoSetAttribute( const wxString& name, wxVariant& va
 // wxColourProperty
 // -----------------------------------------------------------------------
 
 // wxColourProperty
 // -----------------------------------------------------------------------
 

-static const wxChar* gs_cp_es_normcolour_labels[] = {
+static const wxChar* const gs_cp_es_normcolour_labels[] = {

     wxT("Black"),
     wxT("Maroon"),
     wxT("Navy"),
     wxT("Black"),
     wxT("Maroon"),
     wxT("Navy"),


@@ -1496,7 +1518,7 @@ static const wxChar* gs_cp_es_normcolour_labels[] = {
     (const wxChar*) NULL
 };
 
     (const wxChar*) NULL
 };
 

-static unsigned long gs_cp_es_normcolour_colours[] = {
+static const unsigned long gs_cp_es_normcolour_colours[] = {

     wxPG_COLOUR(0,0,0),
     wxPG_COLOUR(128,0,0),
     wxPG_COLOUR(0,0,128),
     wxPG_COLOUR(0,0,0),
     wxPG_COLOUR(128,0,0),
     wxPG_COLOUR(0,0,128),


@@ -1585,7 +1607,7 @@ wxVariant wxColourProperty::DoTranslateVal( wxColourPropertyValue& v ) const
 #define NUM_CURSORS 28
 
 //#define wx_cp_es_syscursors_len 28
 #define NUM_CURSORS 28
 
 //#define wx_cp_es_syscursors_len 28

-static const wxChar* gs_cp_es_syscursors_labels[NUM_CURSORS+1] = {
+static const wxChar* const gs_cp_es_syscursors_labels[NUM_CURSORS+1] = {

     wxT("Default"),
     wxT("Arrow"),
     wxT("Right Arrow"),
     wxT("Default"),
     wxT("Arrow"),
     wxT("Right Arrow"),


@@ -1617,7 +1639,7 @@ static const wxChar* gs_cp_es_syscursors_labels[NUM_CURSORS+1] = {
     (const wxChar*) NULL
 };
 
     (const wxChar*) NULL
 };
 

-static long gs_cp_es_syscursors_values[NUM_CURSORS] = {
+static const long gs_cp_es_syscursors_values[NUM_CURSORS] = {

     wxCURSOR_NONE,
     wxCURSOR_ARROW,
     wxCURSOR_RIGHT_ARROW,
     wxCURSOR_NONE,
     wxCURSOR_ARROW,
     wxCURSOR_RIGHT_ARROW,