Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / samples / propgrid / propgrid.cpp

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 22d474fb4e91c4f0b40d76e7ec71c9ed61a3e3d7..08a6c3eddef25cff7a6f38d9959288af5a726e6a 100644 (file)
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -68,7 +68,7 @@
 
 #include <wx/artprov.h>
 
-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
@@ -128,7 +128,7 @@ bool wxSampleMultiButtonEditor::OnEvent( wxPropertyGrid* propGrid,
                                          wxWindow* ctrl,
                                          wxEvent& event ) const
 {
-    if ( event.GetEventType() == wxEVT_COMMAND_BUTTON_CLICKED )
+    if ( event.GetEventType() == wxEVT_BUTTON )
     {
         wxPGMultiButton* buttons = (wxPGMultiButton*) propGrid->GetEditorControlSecondary();
 
@@ -322,7 +322,7 @@ public:
         wxString s = ::wxGetSingleChoice(wxT("Message"),
                                          wxT("Caption"),
                                          m_choices.GetLabels());
-        if ( s.length() )
+        if ( !s.empty() )
         {
             SetValue(s);
             return true;
@@ -650,7 +650,7 @@ void FormMain::OnPropertyGridChanging( wxPropertyGridEvent& event )
             event.Veto();
 
             // Since we ask a question, it is better if we omit any validation
-            // failure behavior.
+            // failure behaviour.
             event.SetValidationFailureBehavior(0);
         }
     }
@@ -711,7 +711,7 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event )
     if ( name == wxT("Font") )
     {
         wxFont font = wxANY_AS(value, wxFont);
-        wxASSERT( font.Ok() );
+        wxASSERT( font.IsOk() );
 
         m_pPropGridManager->SetFont( font );
     }
@@ -1098,7 +1098,7 @@ void FormMain::PopulateWithStandardItems ()
     pg->SetPropertyAttribute(wxT("Y"), wxPG_ATTR_UNITS, wxT("Pixels") );
     pg->SetPropertyHelpString(wxT("Y"), wxT("This property uses \"Units\" attribute.") );
 
-    const wxChar* disabledHelpString = wxT("This property is simply disabled. Inorder to have label disabled as well, ")
+    const wxChar* disabledHelpString = wxT("This property is simply disabled. In order to have label disabled as well, ")
                                        wxT("you need to set wxPG_EX_GREY_LABEL_WHEN_DISABLED using SetExtraStyle.");
 
     pg->Append( new wxPropertyCategory(wxT("Environment"),wxPG_LABEL) );
@@ -1259,13 +1259,19 @@ void FormMain::PopulateWithExamples ()
 #endif
 
     pid = pg->Append( new wxColourProperty(wxT("ColourProperty"),wxPG_LABEL,*wxRED) );
-    //pg->SetPropertyAttribute(pid,wxPG_COLOUR_ALLOW_CUSTOM,false);
     pg->SetPropertyEditor( wxT("ColourProperty"), wxPGEditor_ComboBox );
     pg->GetProperty(wxT("ColourProperty"))->SetAutoUnspecified(true);
     pg->SetPropertyHelpString( wxT("ColourProperty"),
         wxT("wxPropertyGrid::SetPropertyEditor method has been used to change ")
         wxT("editor of this property to wxPGEditor_ComboBox)"));
 
+    pid = pg->Append( new wxColourProperty("ColourPropertyWithAlpha",
+                                           wxPG_LABEL,
+                                           wxColour(15, 200, 95, 128)) );
+    pg->SetPropertyAttribute("ColourPropertyWithAlpha", "HasAlpha", true);
+    pg->SetPropertyHelpString("ColourPropertyWithAlpha",
+        "Attribute \"HasAlpha\" is set to true for this property.");
+
     //
     // This demonstrates using alternative editor for colour property
     // to trigger colour dialog directly from button.
@@ -1926,7 +1932,7 @@ void FormMain::CreateGrid( int style, int extraStyle )
 
     pgman->SetExtraStyle(extraStyle);
 
-    // This is the default validation failure behavior
+    // This is the default validation failure behaviour
     m_pPropGridManager->SetValidationFailureBehavior( wxPG_VFB_MARK_CELL |
                                                       wxPG_VFB_SHOW_MESSAGEBOX );
 
@@ -2018,7 +2024,7 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
     wxMenu *menuTools2 = new wxMenu;
     wxMenu *menuHelp = new wxMenu;
 
-    menuHelp->Append(ID_ABOUT, wxT("&About..."), wxT("Show about dialog") );
+    menuHelp->Append(ID_ABOUT, wxT("&About"), wxT("Show about dialog") );
 
     menuTools1->Append(ID_APPENDPROP, wxT("Append New Property") );
     menuTools1->Append(ID_APPENDCAT, wxT("Append New Category\tCtrl-S") );