Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 850016e81258c97676ca48a887a704464fefeac4..97647f7e3093ea0312ca7c0e76a0d82b8cc06ae4 100644 (file)
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -149,7 +149,7 @@
 // Number added to image width for SetCustomPaintWidth
 #define ODCB_CUST_PAINT_MARGIN               6
 
 // Number added to image width for SetCustomPaintWidth
 #define ODCB_CUST_PAINT_MARGIN               6
 

-// Milliseconds to wait for two mouse-ups after focus inorder
+// Milliseconds to wait for two mouse-ups after focus in order

 // to trigger a double-click.
 #define DOUBLE_CLICK_CONVERSION_TRESHOLD        500
 
 // to trigger a double-click.
 #define DOUBLE_CLICK_CONVERSION_TRESHOLD        500
 


@@ -444,7 +444,7 @@ bool wxPGTextCtrlEditor::GetTextCtrlValueFromControl( wxVariant& variant, wxPGPr
     wxTextCtrl* tc = wxStaticCast(ctrl, wxTextCtrl);
     wxString textVal = tc->GetValue();
 
     wxTextCtrl* tc = wxStaticCast(ctrl, wxTextCtrl);
     wxString textVal = tc->GetValue();
 

-    if ( property->UsesAutoUnspecified() && !textVal.length() )
+    if ( property->UsesAutoUnspecified() && textVal.empty() )

     {
         variant.MakeNull();
         return true;
     {
         variant.MakeNull();
         return true;


@@ -774,7 +774,7 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
 
     const wxBitmap* itemBitmap = NULL;
 
 
     const wxBitmap* itemBitmap = NULL;
 

-    if ( item >= 0 && choices.IsOk() && choices.Item(item).GetBitmap().Ok() && comValIndex == -1 )
+    if ( item >= 0 && choices.IsOk() && choices.Item(item).GetBitmap().IsOk() && comValIndex == -1 )

         itemBitmap = &choices.Item(item).GetBitmap();
 
     //
         itemBitmap = &choices.Item(item).GetBitmap();
 
     //


@@ -1070,10 +1070,10 @@ wxWindow* wxPGChoiceEditor::CreateControlsBase( wxPropertyGrid* propGrid,
     if ( index >= 0 && index < (int)cb->GetCount() )
     {
         cb->SetSelection( index );
     if ( index >= 0 && index < (int)cb->GetCount() )
     {
         cb->SetSelection( index );

-        if ( defString.length() )
+        if ( !defString.empty() )

             cb->SetText( defString );
     }
             cb->SetText( defString );
     }

-    else if ( !(extraStyle & wxCB_READONLY) && defString.length() )
+    else if ( !(extraStyle & wxCB_READONLY) && !defString.empty() )

     {
         propGrid->SetupTextCtrlValue(defString);
         cb->SetValue( defString );
     {
         propGrid->SetupTextCtrlValue(defString);
         cb->SetValue( defString );


@@ -1283,7 +1283,7 @@ bool wxPGComboBoxEditor::GetValueFromControl( wxVariant& variant, wxPGProperty*
     wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
     wxString textVal = cb->GetValue();
 
     wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
     wxString textVal = cb->GetValue();
 

-    if ( property->UsesAutoUnspecified() && !textVal.length() )
+    if ( property->UsesAutoUnspecified() && textVal.empty() )

     {
         variant.MakeNull();
         return true;
     {
         variant.MakeNull();
         return true;


@@ -2159,35 +2159,35 @@ void wxPGMultiButton::Finalize( wxPropertyGrid* WXUNUSED(propGrid),
     Move( pos.x + m_fullEditorSize.x - m_buttonsWidth, pos.y );
 }
 
     Move( pos.x + m_fullEditorSize.x - m_buttonsWidth, pos.y );
 }
 

-int wxPGMultiButton::GenId( int id ) const
+int wxPGMultiButton::GenId( int itemid ) const

 {
 {

-    if ( id < -1 )
+    if ( itemid < -1 )

     {
         if ( m_buttons.size() )
     {
         if ( m_buttons.size() )

-            id = GetButton(m_buttons.size()-1)->GetId() + 1;
+            itemid = GetButton(m_buttons.size()-1)->GetId() + 1;

         else
         else

-            id = wxPG_SUBID2;
+            itemid = wxPG_SUBID2;

     }
     }

-    return id;
+    return itemid;

 }
 
 #if wxUSE_BMPBUTTON
 }
 
 #if wxUSE_BMPBUTTON

-void wxPGMultiButton::Add( const wxBitmap& bitmap, int id )
+void wxPGMultiButton::Add( const wxBitmap& bitmap, int itemid )

 {
 {

-    id = GenId(id);
+    itemid = GenId(itemid);

     wxSize sz = GetSize();
     wxSize sz = GetSize();

-    wxButton* button = new wxBitmapButton( this, id, bitmap,
+    wxButton* button = new wxBitmapButton( this, itemid, bitmap,

                                            wxPoint(sz.x, 0),
                                            wxSize(sz.y, sz.y) );
     DoAddButton( button, sz );
 }
 #endif
 
                                            wxPoint(sz.x, 0),
                                            wxSize(sz.y, sz.y) );
     DoAddButton( button, sz );
 }
 #endif
 

-void wxPGMultiButton::Add( const wxString& label, int id )
+void wxPGMultiButton::Add( const wxString& label, int itemid )

 {
 {

-    id = GenId(id);
+    itemid = GenId(itemid);

     wxSize sz = GetSize();
     wxSize sz = GetSize();

-    wxButton* button = new wxButton( this, id, label, wxPoint(sz.x, 0),
+    wxButton* button = new wxButton( this, itemid, label, wxPoint(sz.x, 0),

                                      wxSize(sz.y, sz.y) );
     DoAddButton( button, sz );
 }
                                      wxSize(sz.y, sz.y) );
     DoAddButton( button, sz );
 }