Expunge most of wxVariant

Aegisub · Jan 1, 2015 · be9764d · be9764d
1 parent 72c439e
commit be9764d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 1 deletion.
diff --git a/include/wx/dataview.h b/include/wx/dataview.h
@@ -1100,11 +1100,13 @@ class WXDLLIMPEXP_ADV wxDataViewListCtrl: public wxDataViewCtrl
     wxString GetTextValue( unsigned int row, unsigned int col ) const
         { wxVariant value; GetStore()->GetValueByRow( value, row, col ); return value.GetString(); }
 
+#if 0
     void SetToggleValue( bool value, unsigned int row, unsigned int col )
         { GetStore()->SetValueByRow( value, row, col );
           GetStore()->RowValueChanged( row, col); }
     bool GetToggleValue( unsigned int row, unsigned int col ) const
         { wxVariant value; GetStore()->GetValueByRow( value, row, col ); return value.GetBool(); }
+#endif
 
     void SetItemData( const wxDataViewItem& item, wxUIntPtr data )
         { GetStore()->SetItemData( item, data ); }

diff --git a/include/wx/variant.h b/include/wx/variant.h
@@ -163,6 +163,7 @@ class WXDLLIMPEXP_BASE wxVariant: public wxObject
     wxAny GetAny() const;
 #endif
 
+#if 0
     // double
     wxVariant(double val, const wxString& name = wxEmptyString);
     bool operator== (double value) const;
@@ -199,6 +200,7 @@ class WXDLLIMPEXP_BASE wxVariant: public wxObject
     void operator= (const wxDateTime& value) ;
     inline operator wxDateTime () const { return GetDateTime(); }
     wxDateTime GetDateTime() const;
+#endif
 #endif
 
     // wxString
@@ -249,6 +251,7 @@ class WXDLLIMPEXP_BASE wxVariant: public wxObject
     operator wxStdWideString() const { return (operator wxString()).ToStdWstring(); }
 #endif // wxUSE_STD_STRING
 
+#if 0
     // wxUniChar
     wxVariant(const wxUniChar& val, const wxString& name = wxEmptyString);
     wxVariant(const wxUniCharRef& val, const wxString& name = wxEmptyString);
@@ -345,6 +348,7 @@ class WXDLLIMPEXP_BASE wxVariant: public wxObject
 
     // Clear list
     void ClearList();
+#endif
 
 public:
     // Type conversion

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
@@ -325,6 +325,7 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
         if (res)
             return res;
     }
+#if 0
     else if (value1.GetType() == wxT("long"))
     {
         long l1 = value1.GetLong();
@@ -360,6 +361,7 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
         if (b1 != b2)
             return b1 ? 1 : -1;
     }
+#endif
     else if (value1.GetType() == wxT("wxDataViewIconText"))
     {
         wxDataViewIconText iconText1, iconText2;
@@ -1144,6 +1146,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int mo
     return ret;
 }
 
+#if 0
 wxDataViewColumn *
 wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
@@ -1187,6 +1190,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int mode
     AppendColumn( ret );
     return ret;
 }
+#endif
 
 wxDataViewColumn *
 wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
@@ -1210,6 +1214,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int mo
     return ret;
 }
 
+#if 0
 wxDataViewColumn *
 wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
@@ -1253,6 +1258,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int mode
     AppendColumn( ret );
     return ret;
 }
+#endif
 
 wxDataViewColumn *
 wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model_column,
@@ -1276,6 +1282,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int m
     return ret;
 }
 
+#if 0
 wxDataViewColumn *
 wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
@@ -1320,6 +1327,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int mod
     PrependColumn( ret );
     return ret;
 }
+#endif
 
 wxDataViewColumn *
 wxDataViewCtrlBase::PrependTextColumn( const wxBitmap &label, unsigned int model_column,
@@ -1343,6 +1351,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxBitmap &label, unsigned int m
     return ret;
 }
 
+#if 0
 wxDataViewColumn *
 wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
@@ -1386,6 +1395,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int mod
     PrependColumn( ret );
     return ret;
 }
+#endif
 
 bool
 wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
@@ -1450,6 +1460,7 @@ wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_DROP, wxDataViewEvent );
 // wxDataViewSpinRenderer
 // -------------------------------------
 
+#if 0
 wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) :
    wxDataViewCustomRenderer(wxT("long"), mode, alignment )
 {
@@ -2547,6 +2558,7 @@ void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
 #endif
     event.Skip( true );
 }
+#endif
 
 #endif // wxUSE_DATAVIEWCTRL
 
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
@@ -234,6 +234,7 @@ wxAny wxVariant::GetAny() const
 
 #endif // wxUSE_ANY
 
+#if 0
 // -----------------------------------------------------------------
 // wxVariantDataLong
 // -----------------------------------------------------------------
@@ -839,6 +840,8 @@ wxUniChar wxVariant::GetChar() const
     }
 }
 
+#endif
+
 // ----------------------------------------------------------------------------
 // wxVariantDataString
 // ----------------------------------------------------------------------------
@@ -1038,6 +1041,7 @@ wxString wxVariant::GetString() const
 // wxVariantDataWxObjectPtr
 // ----------------------------------------------------------------------------
 
+#if 0
 class wxVariantDataWxObjectPtr: public wxVariantData
 {
 public:
@@ -2385,12 +2389,16 @@ bool wxVariant::Convert(wchar_t* value) const
     return true;
 }
 
+#endif
+
 bool wxVariant::Convert(wxString* value) const
 {
     *value = MakeString();
     return true;
 }
 
+#if 0
+
 #if wxUSE_LONGLONG
 bool wxVariant::Convert(wxLongLong* value) const
 {
@@ -2507,4 +2515,6 @@ bool wxVariant::Convert(wxDateTime* value) const
 }
 #endif // wxUSE_DATETIME
 
+#endif
+
 #endif // wxUSE_VARIANT
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
@@ -1113,6 +1113,7 @@ wxSize wxDataViewBitmapRenderer::GetSize() const
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
 
+#if 0
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer)
 
 wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
@@ -1236,6 +1237,7 @@ wxSize wxDataViewProgressRenderer::GetSize() const
     // behaviour. Keep the height fixed so that the progress bar isn't too fat.
     return wxSize(-1, 12);
 }
+#endif
 
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
@@ -129,7 +129,7 @@ wxBasicString::~wxBasicString()
 // Convert variants
 // ----------------------------------------------------------------------------
 
-#if wxUSE_VARIANT
+#if 0
 
 // ----------------------------------------------------------------------------
 // wxVariantDataCurrency