Compile fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 12164ccd54a4c0f41324585f9e4884561aed0f41..95e4296b55b3bb0604a333262c7e1c2328c59946 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -81,6 +81,9 @@ private:
 
 class WXDLLEXPORT wxPrivateDataObject : public wxDataObject
 {
 
 class WXDLLEXPORT wxPrivateDataObject : public wxDataObject
 {

+#ifdef __WXGTK__
+    DECLARE_DYNAMIC_CLASS( wxPrivateDataObject )
+#endif

 
 public:
     wxPrivateDataObject();
 
 public:
     wxPrivateDataObject();


@@ -117,11 +120,8 @@ public:
     virtual void GetDataHere(void *dest) const
         { WriteData(dest); }
 
     virtual void GetDataHere(void *dest) const
         { WriteData(dest); }
 

-protected:

     // the function which really copies the data - called by WriteData() above
     // and uses GetSize() to get the size of the data
     // the function which really copies the data - called by WriteData() above
     // and uses GetSize() to get the size of the data

-    //
-    // VZ: I really wonder why do we need it

     void WriteData( const void *data, void *dest ) const;
 
 private:
     void WriteData( const void *data, void *dest ) const;
 
 private:

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 79a7c6e1cc7a7126abcf14ce1d3ec2e644ff2a18..ed8e907060729209e5e31ba9f5a96d360c25c216 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -970,7 +970,9 @@ void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *it
   
   if (TagAllChildrenUntilLast(first,last,select)) return;
 
   
   if (TagAllChildrenUntilLast(first,last,select)) return;
 

+/*

   cout << first->GetText() << " " << last->GetText() << " " << (int) select << endl;
   cout << first->GetText() << " " << last->GetText() << " " << (int) select << endl;

+*/

   TagNextChildren(first,last,select);  
 }
 
   TagNextChildren(first,last,select);  
 }
 


@@ -998,14 +1000,18 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
     event.SetEventObject( this );
     // Here we don't send any selection mode yet ! TO SEE 
     
     event.SetEventObject( this );
     // Here we don't send any selection mode yet ! TO SEE 
     

+/*

     if (m_current)
       cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl;
     if (m_current)
       cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl;

+*/

 
     if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() )
       return;
 
 
     if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() )
       return;
 

+/*

     if (m_current)
     if (m_current)

-    cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl;
+      cout << m_current->GetText() << " " << (int)m_current->HasHilight() << endl;
+*/

 
     // ctrl press
     if (unselect_others)
 
     // ctrl press
     if (unselect_others)

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 4d206d3c6d0791d9d407cb9ef3a3c37f64862e14..51169aaa6041cc961bad5365132a393f2b3148dd 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -695,9 +695,9 @@ void wxTextCtrl::SetSelection( long from, long to )
     gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
     gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 

-void wxTextCtrl::ShowPosition( long pos )
+void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )

 {
 {

-    SetInsertionPoint( pos );
+//    SetInsertionPoint( pos );

 }
 
 long wxTextCtrl::GetInsertionPoint() const
 }
 
 long wxTextCtrl::GetInsertionPoint() const

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 4d206d3c6d0791d9d407cb9ef3a3c37f64862e14..51169aaa6041cc961bad5365132a393f2b3148dd 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -695,9 +695,9 @@ void wxTextCtrl::SetSelection( long from, long to )
     gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
     gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 

-void wxTextCtrl::ShowPosition( long pos )
+void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )

 {
 {

-    SetInsertionPoint( pos );
+//    SetInsertionPoint( pos );

 }
 
 long wxTextCtrl::GetInsertionPoint() const
 }
 
 long wxTextCtrl::GetInsertionPoint() const