Added wxPropList library

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

diff --git a/install/unix/setup/general/createall b/install/unix/setup/general/createall
index 6e4446da1d1693a69206d46953fb1f6ae1faa8d7..9968162e6263891bc3fdaa490cae53e876966dec 100755 (executable)
--- a/install/unix/setup/general/createall
+++ b/install/unix/setup/general/createall
@@ -45,7 +45,7 @@ if test "x$OS" = x; then
   exit 1
 fi
 
   exit 1
 fi
 

-SRC_DIR=`readbase src src`
+SRC_DIR=`readbase src`

 SAMPLES_DIR=`readbase2 samples`
 UTILS_DIR=`readbase2 utils`
 USER_DIR=`readbase2 user`
 SAMPLES_DIR=`readbase2 samples`
 UTILS_DIR=`readbase2 utils`
 USER_DIR=`readbase2 user`

diff --git a/utils/serialize/.cvsignore b/utils/serialize/.cvsignore
index 4daa84b813bc1c017fa8d226e233a2b3f1905a48..4646a42c354fc790c98ec789f93fd85a0caf013b 100644 (file)
--- a/utils/serialize/.cvsignore
+++ b/utils/serialize/.cvsignore
@@ -1,2 +1,3 @@
 Linux
 linux-gnu
 Linux
 linux-gnu

+linux

diff --git a/utils/serialize/Makefile b/utils/serialize/Makefile
index 027d82ae19872319aee4ed130e8596da7cc039d6..3684ed3ced0aa3b700164ce010b1d1924fe849c0 100644 (file)
--- a/utils/serialize/Makefile
+++ b/utils/serialize/Makefile
@@ -1 +1 @@
-include ../../src/gtk/setup/general/makeapp
+include ../../install/unix/setup/general/makedirs

diff --git a/utils/wxprop/Makefile b/utils/wxprop/Makefile
new file mode 100644 (file)
index 0000000..3684ed3
--- /dev/null
+++ b/utils/wxprop/Makefile
@@ -0,0 +1 @@
+include ../../install/unix/setup/general/makedirs

diff --git a/utils/wxprop/src/.cvsignore b/utils/wxprop/src/.cvsignore
new file mode 100644 (file)
index 0000000..4646a42
--- /dev/null
+++ b/utils/wxprop/src/.cvsignore
@@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux

diff --git a/utils/wxprop/src/Makefile b/utils/wxprop/src/Makefile
new file mode 100644 (file)
index 0000000..e871237
--- /dev/null
+++ b/utils/wxprop/src/Makefile
@@ -0,0 +1 @@
+include ../../../install/unix/setup/general/makedirs

diff --git a/utils/wxprop/src/Makefile.in b/utils/wxprop/src/Makefile.in
new file mode 100644 (file)
index 0000000..776e170
--- /dev/null
+++ b/utils/wxprop/src/Makefile.in
@@ -0,0 +1,45 @@
+#
+#  wxprop source makefile for Unix
+#
+#  Copyright 1998, Robert Roebling
+#
+
+# wxWindows base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+
+# compile a library only
+RULE=gslib
+
+# needed for unactivated
+NONE=
+
+# define library name
+LIB_TARGET=wx_prop_gtk
+LIB_MAJOR=0
+LIB_MINOR=1
+
+# define library sources
+
+LIB_CPP_SRC=\
+\
+ prop.cpp \
+ propform.cpp \
+ proplist.cpp
+
+#define library objects
+LIB_OBJ=\
+ $(LIB_CPP_SRC:.cpp=.o)
+
+all::
+
+clean::
+
+#additional things needed for compile
+ADD_COMPILE= 
+
+# include the definitions now
+include ../../../../template.mak
+

diff --git a/utils/wxprop/src/prop.cpp b/utils/wxprop/src/prop.cpp
index 3b5b0367b835d0f3c367c9110db1637582a5bf41..3a487cf997b4168dd0a7740e1494e76c369067f3 100644 (file)
--- a/utils/wxprop/src/prop.cpp
+++ b/utils/wxprop/src/prop.cpp
@@ -942,17 +942,17 @@ wxPropertySheet::~wxPropertySheet(void)
   Clear();
 }
 
   Clear();
 }
 

-bool wxPropertySheet::Save(ostream& str)
+bool wxPropertySheet::Save( ostream& WXUNUSED(str) )

 {
   return FALSE;
 }
 
 {
   return FALSE;
 }
 

-bool wxPropertySheet::Load(ostream& str)
+bool wxPropertySheet::Load( ostream& WXUNUSED(str) )

 {
   return FALSE;
 }
 
 {
   return FALSE;
 }
 

-void wxPropertySheet::UpdateAllViews(wxPropertyView *thisView)
+void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )

 {
 }
 
 {
 }
 

diff --git a/utils/wxprop/src/prop.h b/utils/wxprop/src/prop.h
index e62e022ebbb2876accb30aff0a3f6b96aefb4c73..45c529a8a60b279839aee0d0db91bfb92dcbc978 100644 (file)
--- a/utils/wxprop/src/prop.h
+++ b/utils/wxprop/src/prop.h
@@ -86,7 +86,7 @@ class wxPropertyView: public wxEvtHandler
   ~wxPropertyView(void);
 
   // Associates and shows the view
   ~wxPropertyView(void);
 
   // Associates and shows the view

-  virtual void ShowView(wxPropertySheet *propertySheet, wxWindow *panel) {};
+  virtual void ShowView(wxPropertySheet *WXUNUSED(propertySheet), wxWindow *WXUNUSED(panel)) {}

 
   // Update this view of the viewed object, called e.g. by
   // the object itself.
 
   // Update this view of the viewed object, called e.g. by
   // the object itself.


@@ -240,13 +240,16 @@ class wxPropertyValue: public wxObject
   virtual void Insert(wxPropertyValue *expr);
 
   // Get first expr in list
   virtual void Insert(wxPropertyValue *expr);
 
   // Get first expr in list

-  virtual inline wxPropertyValue *GetFirst(void) { return ((type == wxPropertyValueList) ? value.first : NULL); }
+  virtual inline wxPropertyValue *GetFirst(void) 
+    { return ((type == wxPropertyValueList) ? value.first : (wxPropertyValue*)NULL); }

 
   // Get next expr if this is a node in a list
 
   // Get next expr if this is a node in a list

-  virtual inline wxPropertyValue *GetNext(void) { return next; }
+  virtual inline wxPropertyValue *GetNext(void) 
+    { return next; }

 
   // Get last expr in list
 
   // Get last expr in list

-  virtual inline wxPropertyValue *GetLast(void) { return ((type == wxPropertyValueList) ? last : NULL); }
+  virtual inline wxPropertyValue *GetLast(void) 
+    { return ((type == wxPropertyValueList) ? last : (wxPropertyValue*)NULL); }

   
   // Delete this node from the list
   virtual void Delete(wxPropertyValue *node);
   
   // Delete this node from the list
   virtual void Delete(wxPropertyValue *node);

diff --git a/utils/wxprop/src/propform.cpp b/utils/wxprop/src/propform.cpp
index ac5aed868fe0f4a304debe23087b1e13928a6d6e..ccbacde54a769784745f8e300d976327fa034b09 100644 (file)
--- a/utils/wxprop/src/propform.cpp
+++ b/utils/wxprop/src/propform.cpp
@@ -176,7 +176,7 @@ bool wxPropertyFormView::OnClose(void)
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxPropertyFormView::OnOk(wxCommandEvent& event)
+void wxPropertyFormView::OnOk(wxCommandEvent& WXUNUSED(event))

 {
   // Retrieve the value if any
   if (!Check())
 {
   // Retrieve the value if any
   if (!Check())


@@ -187,23 +187,23 @@ void wxPropertyFormView::OnOk(wxCommandEvent& event)
   managedWindow->Close(TRUE);
 }
 
   managedWindow->Close(TRUE);
 }
 

-void wxPropertyFormView::OnCancel(wxCommandEvent& event)
+void wxPropertyFormView::OnCancel(wxCommandEvent& WXUNUSED(event))

 {
   dialogCancelled = TRUE;
   
   managedWindow->Close(TRUE);
 }
 
 {
   dialogCancelled = TRUE;
   
   managedWindow->Close(TRUE);
 }
 

-void wxPropertyFormView::OnHelp(wxCommandEvent& event)
+void wxPropertyFormView::OnHelp(wxCommandEvent& WXUNUSED(event))

 {
 }
 
 {
 }
 

-void wxPropertyFormView::OnUpdate(wxCommandEvent& event)
+void wxPropertyFormView::OnUpdate(wxCommandEvent& WXUNUSED(event))

 {
   TransferToPropertySheet();
 }
 
 {
   TransferToPropertySheet();
 }
 

-void wxPropertyFormView::OnRevert(wxCommandEvent& event)
+void wxPropertyFormView::OnRevert(wxCommandEvent& WXUNUSED(event))

 {
   TransferToDialog();
 }
 {
   TransferToDialog();
 }


@@ -395,7 +395,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxRealFormValidator, wxPropertyFormValidator)
 ///
 /// Real number form validator
 /// 
 ///
 /// Real number form validator
 /// 

-bool wxRealFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *parentWindow)

 {
   if (realMin == 0.0 && realMax == 0.0)
     return TRUE;
 {
   if (realMin == 0.0 && realMax == 0.0)
     return TRUE;


@@ -426,7 +427,8 @@ bool wxRealFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxRealFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxRealFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *WXUNUSED(parentWindow) )

 {
   // The item used for viewing the real number: should be a text item.
   wxWindow *propertyWindow = property->GetWindow();
 {
   // The item used for viewing the real number: should be a text item.
   wxWindow *propertyWindow = property->GetWindow();


@@ -443,7 +445,8 @@ bool wxRealFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormVi
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *WXUNUSED(parentWindow) )

 {
   // The item used for viewing the real number: should be a text item.
   wxWindow *propertyWindow = property->GetWindow();
 {
   // The item used for viewing the real number: should be a text item.
   wxWindow *propertyWindow = property->GetWindow();


@@ -460,7 +463,8 @@ bool wxRealFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormVie
 /// 
 IMPLEMENT_DYNAMIC_CLASS(wxIntegerFormValidator, wxPropertyFormValidator)
 
 /// 
 IMPLEMENT_DYNAMIC_CLASS(wxIntegerFormValidator, wxPropertyFormValidator)
 

-bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *parentWindow)

 {
   if (integerMin == 0.0 && integerMax == 0.0)
     return TRUE;
 {
   if (integerMin == 0.0 && integerMax == 0.0)
     return TRUE;


@@ -501,7 +505,8 @@ bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVi
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *WXUNUSED(parentWindow))

 {
   // The item used for viewing the real number: should be a text item or a slider
   wxWindow *propertyWindow = property->GetWindow();
 {
   // The item used for viewing the real number: should be a text item or a slider
   wxWindow *propertyWindow = property->GetWindow();


@@ -528,7 +533,8 @@ bool wxIntegerFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFor
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxIntegerFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxIntegerFormValidator::OnDisplayValue( wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *WXUNUSED(parentWindow))

 {
   // The item used for viewing the real number: should be a text item or a slider
   wxWindow *propertyWindow = property->GetWindow();
 {
   // The item used for viewing the real number: should be a text item or a slider
   wxWindow *propertyWindow = property->GetWindow();


@@ -554,7 +560,8 @@ bool wxIntegerFormValidator::OnDisplayValue(wxProperty *property, wxPropertyForm
 /// 
 IMPLEMENT_DYNAMIC_CLASS(wxBoolFormValidator, wxPropertyFormValidator)
 
 /// 
 IMPLEMENT_DYNAMIC_CLASS(wxBoolFormValidator, wxPropertyFormValidator)
 

-bool wxBoolFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxBoolFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *WXUNUSED(parentWindow))

 {
   // The item used for viewing the boolean: should be a checkbox
   wxWindow *propertyWindow = property->GetWindow();
 {
   // The item used for viewing the boolean: should be a checkbox
   wxWindow *propertyWindow = property->GetWindow();


@@ -564,7 +571,8 @@ bool wxBoolFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxBoolFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxBoolFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *WXUNUSED(parentWindow) )

 {
   // The item used for viewing the boolean: should be a checkbox.
   wxWindow *propertyWindow = property->GetWindow();
 {
   // The item used for viewing the boolean: should be a checkbox.
   wxWindow *propertyWindow = property->GetWindow();


@@ -577,7 +585,8 @@ bool wxBoolFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormVi
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxBoolFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxBoolFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *WXUNUSED(parentWindow))

 {
   // The item used for viewing the boolean: should be a checkbox.
   wxWindow *propertyWindow = property->GetWindow();
 {
   // The item used for viewing the boolean: should be a checkbox.
   wxWindow *propertyWindow = property->GetWindow();


@@ -600,7 +609,8 @@ wxStringFormValidator::wxStringFormValidator(wxStringList *list, long flags):
   strings = list;
 }
 
   strings = list;
 }
 

-bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *parentWindow )

 {
   if (!strings)
     return TRUE;
 {
   if (!strings)
     return TRUE;


@@ -629,7 +639,8 @@ bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVie
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *WXUNUSED(parentWindow) )

 {
   // The item used for viewing the string: should be a text item, choice item or listbox.
   wxWindow *propertyWindow = property->GetWindow();
 {
   // The item used for viewing the string: should be a text item, choice item or listbox.
   wxWindow *propertyWindow = property->GetWindow();


@@ -666,7 +677,8 @@ bool wxStringFormValidator::OnRetrieveValue(wxProperty *property, wxPropertyForm
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxStringFormValidator::OnDisplayValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view), 
+  wxWindow *WXUNUSED(parentWindow) )

 {
   // The item used for viewing the string: should be a text item, choice item or listbox.
   wxWindow *propertyWindow = property->GetWindow();
 {
   // The item used for viewing the string: should be a text item, choice item or listbox.
   wxWindow *propertyWindow = property->GetWindow();

diff --git a/utils/wxprop/src/propform.h b/utils/wxprop/src/propform.h
index 242204d7faf3fd4ca9c798579974b99ddee60f52..f00ad7f7011ca8ab05eedfb2257149575a47c6a0 100644 (file)
--- a/utils/wxprop/src/propform.h
+++ b/utils/wxprop/src/propform.h
@@ -117,8 +117,8 @@ class wxPropertyFormValidator: public wxPropertyValidator
   
    // Called to check value is OK (e.g. when OK is pressed)
    // Return FALSE if value didn't check out; signal to restore old value.
   
    // Called to check value is OK (e.g. when OK is pressed)
    // Return FALSE if value didn't check out; signal to restore old value.

-   virtual bool OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
-   { return TRUE; }
+   virtual bool OnCheckValue( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view), 
+     wxWindow *WXUNUSED(parentWindow) ) { return TRUE; }

 
    // Does the transferance from the property editing area to the property itself.
    // Called by the view, e.g. when closing the window.
 
    // Does the transferance from the property editing area to the property itself.
    // Called by the view, e.g. when closing the window.


@@ -127,11 +127,14 @@ class wxPropertyFormValidator: public wxPropertyValidator
    // Called by the view to transfer the property to the window.
    virtual bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) = 0;
 
    // Called by the view to transfer the property to the window.
    virtual bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) = 0;
 

-  virtual void OnDoubleClick(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) {};
-  virtual void OnSetFocus(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) {};
-  virtual void OnKillFocus(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) {};
-  virtual void OnCommand(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow, wxCommandEvent& event) {};
-
+  virtual void OnDoubleClick( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view), 
+     wxWindow *WXUNUSED(parentWindow) ) { } 
+  virtual void OnSetFocus( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view), 
+     wxWindow *WXUNUSED(parentWindow) ) { }
+  virtual void OnKillFocus( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view), 
+     wxWindow *WXUNUSED(parentWindow) ) { }
+  virtual void OnCommand( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view), 
+     wxWindow *WXUNUSED(parentWindow), wxCommandEvent& WXUNUSED(event) ) {}

 };
 
 /*
 };
 
 /*

diff --git a/utils/wxprop/src/proplist.cpp b/utils/wxprop/src/proplist.cpp
index db2ec2d06ac94515a54846f8e0bc4eac94032524..9e9b60f0534dda2cfdaa32490e4d792ea2c51d7c 100644 (file)
--- a/utils/wxprop/src/proplist.cpp
+++ b/utils/wxprop/src/proplist.cpp
@@ -373,13 +373,13 @@ bool wxPropertyListView::RetrieveProperty(wxProperty *property)
 }
 
 
 }
 
 

-bool wxPropertyListView::EditProperty(wxProperty *property)
+bool wxPropertyListView::EditProperty(wxProperty *WXUNUSED(property))

 {
   return TRUE;
 }
 
 // Called by the listbox callback
 {
   return TRUE;
 }
 
 // Called by the listbox callback

-void wxPropertyListView::OnPropertySelect(wxCommandEvent& event)
+void wxPropertyListView::OnPropertySelect(wxCommandEvent& WXUNUSED(event))

 {
   int sel = propertyScrollingList->GetSelection();
   if (sel > -1)
 {
   int sel = propertyScrollingList->GetSelection();
   if (sel > -1)


@@ -692,7 +692,7 @@ bool wxPropertyListView::OnClose(void)
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxPropertyListView::OnValueListSelect(wxCommandEvent& event)
+void wxPropertyListView::OnValueListSelect(wxCommandEvent& WXUNUSED(event))

 {
   if (currentProperty && currentValidator)
   {
 {
   if (currentProperty && currentValidator)
   {


@@ -713,18 +713,18 @@ void wxPropertyListView::OnOk(wxCommandEvent& event)
   managedWindow->Close(TRUE);
 }
 
   managedWindow->Close(TRUE);
 }
 

-void wxPropertyListView::OnCancel(wxCommandEvent& event)
+void wxPropertyListView::OnCancel(wxCommandEvent& WXUNUSED(event))

 {
 //  SetReturnCode(wxID_CANCEL);
   managedWindow->Close(TRUE);
   dialogCancelled = TRUE;
 }
 
 {
 //  SetReturnCode(wxID_CANCEL);
   managedWindow->Close(TRUE);
   dialogCancelled = TRUE;
 }
 

-void wxPropertyListView::OnHelp(wxCommandEvent& event)
+void wxPropertyListView::OnHelp(wxCommandEvent& WXUNUSED(event))

 {
 }
 
 {
 }
 

-void wxPropertyListView::OnCheck(wxCommandEvent& event)
+void wxPropertyListView::OnCheck(wxCommandEvent& WXUNUSED(event))

 {
   if (currentProperty)
   {
 {
   if (currentProperty)
   {


@@ -732,7 +732,7 @@ void wxPropertyListView::OnCheck(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void wxPropertyListView::OnCross(wxCommandEvent& event)
+void wxPropertyListView::OnCross(wxCommandEvent& WXUNUSED(event))

 {
   if (currentProperty && currentValidator)
   {
 {
   if (currentProperty && currentValidator)
   {


@@ -746,7 +746,7 @@ void wxPropertyListView::OnCross(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void wxPropertyListView::OnPropertyDoubleClick(wxCommandEvent& event)
+void wxPropertyListView::OnPropertyDoubleClick(wxCommandEvent& WXUNUSED(event))

 {
   if (currentProperty && currentValidator)
   {
 {
   if (currentProperty && currentValidator)
   {


@@ -760,7 +760,7 @@ void wxPropertyListView::OnPropertyDoubleClick(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void wxPropertyListView::OnEdit(wxCommandEvent& event)
+void wxPropertyListView::OnEdit(wxCommandEvent& WXUNUSED(event))

 {
   if (currentProperty && currentValidator)
   {
 {
   if (currentProperty && currentValidator)
   {


@@ -797,7 +797,7 @@ wxPropertyListDialog::wxPropertyListDialog(wxPropertyListView *v, wxWindow *pare
      wxDialog(parent, -1, title, pos, size, style, name)
 {
   view = v;
      wxDialog(parent, -1, title, pos, size, style, name)
 {
   view = v;

-  view->AssociatePanel(this);
+  view->AssociatePanel( ((wxPanel*)this) );

   view->SetManagedWindow(this);
   SetAutoLayout(TRUE);
 }
   view->SetManagedWindow(this);
   SetAutoLayout(TRUE);
 }


@@ -815,7 +815,7 @@ bool wxPropertyListDialog::OnClose(void)
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxPropertyListDialog::OnCancel(wxCommandEvent& event)
+void wxPropertyListDialog::OnCancel(wxCommandEvent& WXUNUSED(event))

 {
        SetReturnCode(wxID_CANCEL);
     this->Close();
 {
        SetReturnCode(wxID_CANCEL);
     this->Close();


@@ -865,7 +865,7 @@ bool wxPropertyListPanel::ProcessEvent(wxEvent& event)
                return TRUE;
 }
 
                return TRUE;
 }
 

-void wxPropertyListPanel::OnSize(wxSizeEvent& event)
+void wxPropertyListPanel::OnSize(wxSizeEvent& WXUNUSED(event))

 {
     Layout();
 }
 {
     Layout();
 }


@@ -1778,7 +1778,7 @@ bool wxListOfStringsListValidator::EditStringList(wxWindow *parent, wxStringList
  *
  */
 
  *
  */
 

-void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& event)
+void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& WXUNUSED(event))

 {
   int sel = listBox->GetSelection();
   if (sel > -1)
 {
   int sel = listBox->GetSelection();
   if (sel > -1)


@@ -1789,7 +1789,7 @@ void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& event)
+void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& WXUNUSED(event))

 {
   int sel = listBox->GetSelection();
   if (sel == -1)
 {
   int sel = listBox->GetSelection();
   if (sel == -1)


@@ -1806,7 +1806,7 @@ void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& event)
   stringText->SetValue("");
 }
 
   stringText->SetValue("");
 }
 

-void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& event)
+void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))

 {
   SaveCurrentSelection();
   
 {
   SaveCurrentSelection();
   


@@ -1819,14 +1819,14 @@ void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& event)
   stringText->SetFocus();
 }
 
   stringText->SetFocus();
 }
 

-void wxPropertyStringListEditorDialog::OnOK(wxCommandEvent& event)
+void wxPropertyStringListEditorDialog::OnOK(wxCommandEvent& WXUNUSED(event))

 {
   SaveCurrentSelection();
   EndModal(wxID_OK);
   Close(TRUE);
 }
 
 {
   SaveCurrentSelection();
   EndModal(wxID_OK);
   Close(TRUE);
 }
 

-void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& event)
+void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& WXUNUSED(event))

 {
   dialogCancelled = TRUE;
   EndModal(wxID_CANCEL);
 {
   dialogCancelled = TRUE;
   EndModal(wxID_CANCEL);

diff --git a/utils/wxprop/src/proplist.h b/utils/wxprop/src/proplist.h
index d6dd9ed258892ddef08b50d15a1b931fd383c7e1..14897f62a8c4803052d67e90ebc987f7cdc7a58f 100644 (file)
--- a/utils/wxprop/src/proplist.h
+++ b/utils/wxprop/src/proplist.h
@@ -216,32 +216,30 @@ class wxPropertyListValidator: public wxPropertyValidator
 
    // Called when the property is double clicked. Extra functionality can be provided, such as
    // cycling through possible values.
 
    // Called when the property is double clicked. Extra functionality can be provided, such as
    // cycling through possible values.

-   inline virtual bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-   { return TRUE; }
+   inline virtual bool OnDoubleClick( 
+     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
+     { return TRUE; }

 
    // Called when the value listbox is selected. Default behaviour is to copy
    // string to text control, and retrieve the value into the property.
    virtual bool OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 
    // Called when the property value is edited using standard text control
 
    // Called when the value listbox is selected. Default behaviour is to copy
    // string to text control, and retrieve the value into the property.
    virtual bool OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 
    // Called when the property value is edited using standard text control

-   virtual bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-   {
-     return TRUE;
-   }
+   inline virtual bool OnPrepareControls(
+     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
+     { return TRUE; }

 
    virtual bool OnClearControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 
       // Called when the property is edited in detail
 
    virtual bool OnClearControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 
       // Called when the property is edited in detail

-   virtual bool OnPrepareDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-   {
-     return TRUE;
-   }
+   inline virtual bool OnPrepareDetailControls(
+     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
+     { return TRUE; }

 
    // Called if focus lost, IF we're in a modeless property editing situation.
 
    // Called if focus lost, IF we're in a modeless property editing situation.

-   virtual bool OnClearDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-   {
-     return TRUE;
-   }
+   inline virtual bool OnClearDetailControls(
+     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
+     { return TRUE; }

 
    // Called when the edit (...) button is pressed. The default implementation
    // calls view->BeginDetailedEditing; the filename validator (for example) overrides
 
    // Called when the edit (...) button is pressed. The default implementation
    // calls view->BeginDetailedEditing; the filename validator (for example) overrides


@@ -250,8 +248,9 @@ class wxPropertyListValidator: public wxPropertyValidator
 
    // Called when TICK is pressed or focus is lost.
    // Return FALSE if value didn't check out; signal to restore old value.
 
    // Called when TICK is pressed or focus is lost.
    // Return FALSE if value didn't check out; signal to restore old value.

-   virtual bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
-   { return TRUE; }
+   inline virtual bool OnCheckValue(
+     wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
+     { return TRUE; }

 
    // Called when TICK is pressed or focus is lost or view wants to update
    // the property list.
 
    // Called when TICK is pressed or focus is lost or view wants to update
    // the property list.