Added wxPropList library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6a1120ad4c
commit
8656024d15
@ -45,7 +45,7 @@ if test "x$OS" = x; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SRC_DIR=`readbase src src`
|
SRC_DIR=`readbase src`
|
||||||
SAMPLES_DIR=`readbase2 samples`
|
SAMPLES_DIR=`readbase2 samples`
|
||||||
UTILS_DIR=`readbase2 utils`
|
UTILS_DIR=`readbase2 utils`
|
||||||
USER_DIR=`readbase2 user`
|
USER_DIR=`readbase2 user`
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
Linux
|
Linux
|
||||||
linux-gnu
|
linux-gnu
|
||||||
|
linux
|
||||||
|
@ -1 +1 @@
|
|||||||
include ../../src/gtk/setup/general/makeapp
|
include ../../install/unix/setup/general/makedirs
|
||||||
|
1
utils/wxprop/Makefile
Normal file
1
utils/wxprop/Makefile
Normal file
@ -0,0 +1 @@
|
|||||||
|
include ../../install/unix/setup/general/makedirs
|
3
utils/wxprop/src/.cvsignore
Normal file
3
utils/wxprop/src/.cvsignore
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
Linux
|
||||||
|
linux-gnu
|
||||||
|
linux
|
1
utils/wxprop/src/Makefile
Normal file
1
utils/wxprop/src/Makefile
Normal file
@ -0,0 +1 @@
|
|||||||
|
include ../../../install/unix/setup/general/makedirs
|
45
utils/wxprop/src/Makefile.in
Normal file
45
utils/wxprop/src/Makefile.in
Normal file
@ -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
|
||||||
|
|
@ -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) )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ class wxPropertyView: public wxEvtHandler
|
|||||||
~wxPropertyView(void);
|
~wxPropertyView(void);
|
||||||
|
|
||||||
// Associates and shows the view
|
// 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
|
// Update this view of the viewed object, called e.g. by
|
||||||
// the object itself.
|
// the object itself.
|
||||||
@ -240,13 +240,16 @@ class wxPropertyValue: public wxObject
|
|||||||
virtual void Insert(wxPropertyValue *expr);
|
virtual void Insert(wxPropertyValue *expr);
|
||||||
|
|
||||||
// Get first expr in list
|
// 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
|
// Delete this node from the list
|
||||||
virtual void Delete(wxPropertyValue *node);
|
virtual void Delete(wxPropertyValue *node);
|
||||||
|
@ -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
|
// Retrieve the value if any
|
||||||
if (!Check())
|
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;
|
dialogCancelled = TRUE;
|
||||||
|
|
||||||
managedWindow->Close(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)
|
if (realMin == 0.0 && realMax == 0.0)
|
||||||
return TRUE;
|
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.
|
// The item used for viewing the real number: should be a text item.
|
||||||
wxWindow *propertyWindow = property->GetWindow();
|
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.
|
// The item used for viewing the real number: should be a text item.
|
||||||
wxWindow *propertyWindow = property->GetWindow();
|
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)
|
if (integerMin == 0.0 && integerMax == 0.0)
|
||||||
return TRUE;
|
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
|
// The item used for viewing the real number: should be a text item or a slider
|
||||||
wxWindow *propertyWindow = property->GetWindow();
|
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
|
// The item used for viewing the real number: should be a text item or a slider
|
||||||
wxWindow *propertyWindow = property->GetWindow();
|
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
|
// The item used for viewing the boolean: should be a checkbox
|
||||||
wxWindow *propertyWindow = property->GetWindow();
|
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.
|
// The item used for viewing the boolean: should be a checkbox.
|
||||||
wxWindow *propertyWindow = property->GetWindow();
|
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.
|
// The item used for viewing the boolean: should be a checkbox.
|
||||||
wxWindow *propertyWindow = property->GetWindow();
|
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)
|
if (!strings)
|
||||||
return TRUE;
|
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.
|
// The item used for viewing the string: should be a text item, choice item or listbox.
|
||||||
wxWindow *propertyWindow = property->GetWindow();
|
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.
|
// The item used for viewing the string: should be a text item, choice item or listbox.
|
||||||
wxWindow *propertyWindow = property->GetWindow();
|
wxWindow *propertyWindow = property->GetWindow();
|
||||||
|
@ -117,8 +117,8 @@ class wxPropertyFormValidator: public wxPropertyValidator
|
|||||||
|
|
||||||
// Called to check value is OK (e.g. when OK is pressed)
|
// 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.
|
// Return FALSE if value didn't check out; signal to restore old value.
|
||||||
virtual bool OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
|
virtual bool OnCheckValue( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
|
||||||
{ return TRUE; }
|
wxWindow *WXUNUSED(parentWindow) ) { return TRUE; }
|
||||||
|
|
||||||
// Does the transferance from the property editing area to the property itself.
|
// Does the transferance from the property editing area to the property itself.
|
||||||
// Called by the view, e.g. when closing the window.
|
// 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.
|
// Called by the view to transfer the property to the window.
|
||||||
virtual bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) = 0;
|
virtual bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) = 0;
|
||||||
|
|
||||||
virtual void OnDoubleClick(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) {};
|
virtual void OnDoubleClick( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
|
||||||
virtual void OnSetFocus(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) {};
|
wxWindow *WXUNUSED(parentWindow) ) { }
|
||||||
virtual void OnKillFocus(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow) {};
|
virtual void OnSetFocus( wxProperty *WXUNUSED(property), wxPropertyFormView *WXUNUSED(view),
|
||||||
virtual void OnCommand(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow, wxCommandEvent& event) {};
|
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) ) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -373,13 +373,13 @@ bool wxPropertyListView::RetrieveProperty(wxProperty *property)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool wxPropertyListView::EditProperty(wxProperty *property)
|
bool wxPropertyListView::EditProperty(wxProperty *WXUNUSED(property))
|
||||||
{
|
{
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called by the listbox callback
|
// Called by the listbox callback
|
||||||
void wxPropertyListView::OnPropertySelect(wxCommandEvent& event)
|
void wxPropertyListView::OnPropertySelect(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
int sel = propertyScrollingList->GetSelection();
|
int sel = propertyScrollingList->GetSelection();
|
||||||
if (sel > -1)
|
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);
|
// SetReturnCode(wxID_CANCEL);
|
||||||
managedWindow->Close(TRUE);
|
managedWindow->Close(TRUE);
|
||||||
dialogCancelled = 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)
|
wxDialog(parent, -1, title, pos, size, style, name)
|
||||||
{
|
{
|
||||||
view = v;
|
view = v;
|
||||||
view->AssociatePanel(this);
|
view->AssociatePanel( ((wxPanel*)this) );
|
||||||
view->SetManagedWindow(this);
|
view->SetManagedWindow(this);
|
||||||
SetAutoLayout(TRUE);
|
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);
|
SetReturnCode(wxID_CANCEL);
|
||||||
this->Close();
|
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();
|
int sel = listBox->GetSelection();
|
||||||
if (sel > -1)
|
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();
|
int sel = listBox->GetSelection();
|
||||||
if (sel == -1)
|
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();
|
SaveCurrentSelection();
|
||||||
EndModal(wxID_OK);
|
EndModal(wxID_OK);
|
||||||
Close(TRUE);
|
Close(TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& event)
|
void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
dialogCancelled = TRUE;
|
dialogCancelled = TRUE;
|
||||||
EndModal(wxID_CANCEL);
|
EndModal(wxID_CANCEL);
|
||||||
|
@ -216,32 +216,30 @@ class wxPropertyListValidator: public wxPropertyValidator
|
|||||||
|
|
||||||
// Called when the property is double clicked. Extra functionality can be provided, such as
|
// Called when the property is double clicked. Extra functionality can be provided, such as
|
||||||
// cycling through possible values.
|
// cycling through possible values.
|
||||||
inline virtual bool OnDoubleClick(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
|
inline virtual bool OnDoubleClick(
|
||||||
{ return TRUE; }
|
wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
|
||||||
|
{ return TRUE; }
|
||||||
|
|
||||||
// Called when the value listbox is selected. Default behaviour is to copy
|
// Called when the value listbox is selected. Default behaviour is to copy
|
||||||
// string to text control, and retrieve the value into the property.
|
// string to text control, and retrieve the value into the property.
|
||||||
virtual bool OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
|
virtual bool OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
|
||||||
|
|
||||||
// Called when the property value is edited using standard text control
|
// Called when the property value is edited using standard text control
|
||||||
virtual bool OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
|
inline virtual bool OnPrepareControls(
|
||||||
{
|
wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
|
||||||
return TRUE;
|
{ return TRUE; }
|
||||||
}
|
|
||||||
|
|
||||||
virtual bool OnClearControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
|
virtual bool OnClearControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
|
||||||
|
|
||||||
// Called when the property is edited in detail
|
// Called when the property is edited in detail
|
||||||
virtual bool OnPrepareDetailControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
|
inline virtual bool OnPrepareDetailControls(
|
||||||
{
|
wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
|
||||||
return TRUE;
|
{ 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)
|
inline virtual bool OnClearDetailControls(
|
||||||
{
|
wxProperty *WXUNUSED(property), wxPropertyListView *WXUNUSED(view), wxWindow *WXUNUSED(parentWindow) )
|
||||||
return TRUE;
|
{ return TRUE; }
|
||||||
}
|
|
||||||
|
|
||||||
// Called when the edit (...) button is pressed. The default implementation
|
// Called when the edit (...) button is pressed. The default implementation
|
||||||
// calls view->BeginDetailedEditing; the filename validator (for example) overrides
|
// 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.
|
// Called when TICK is pressed or focus is lost.
|
||||||
// Return FALSE if value didn't check out; signal to restore old value.
|
// Return FALSE if value didn't check out; signal to restore old value.
|
||||||
virtual bool OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
|
inline virtual bool OnCheckValue(
|
||||||
{ return TRUE; }
|
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
|
// Called when TICK is pressed or focus is lost or view wants to update
|
||||||
// the property list.
|
// the property list.
|
||||||
|
Loading…
Reference in New Issue
Block a user