#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if wxUSE_IOSTREAMH
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#endif
+#else
+#include <strstream>
+#endif
#include "wx/window.h"
#include "wx/utils.h"
EVT_BUTTON(wxID_PROP_UPDATE, wxPropertyFormView::OnUpdate)
END_EVENT_TABLE()
-bool wxPropertyFormView::dialogCancelled = FALSE;
+bool wxPropertyFormView::sm_dialogCancelled = FALSE;
wxPropertyFormView::wxPropertyFormView(wxWindow *propPanel, long flags):wxPropertyView(flags)
{
- propertyWindow = propPanel;
- managedWindow = NULL;
+ m_propertyWindow = propPanel;
+ m_managedWindow = NULL;
- windowCloseButton = NULL;
- windowCancelButton = NULL;
- windowHelpButton = NULL;
+ m_windowCloseButton = NULL;
+ m_windowCancelButton = NULL;
+ m_windowHelpButton = NULL;
- detailedEditing = FALSE;
+ m_detailedEditing = FALSE;
}
wxPropertyFormView::~wxPropertyFormView(void)
void wxPropertyFormView::ShowView(wxPropertySheet *ps, wxWindow *panel)
{
- propertySheet = ps;
-
+ m_propertySheet = ps;
+
AssociatePanel(panel);
// CreateControls();
// UpdatePropertyList();
bool wxPropertyFormView::Check(void)
{
- if (!propertySheet)
+ if (!m_propertySheet)
return FALSE;
- wxNode *node = propertySheet->GetProperties().First();
+ wxNode *node = m_propertySheet->GetProperties().First();
while (node)
{
wxProperty *prop = (wxProperty *)node->Data();
if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
{
wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- if (!formValidator->OnCheckValue(prop, this, propertyWindow))
+ if (!formValidator->OnCheckValue(prop, this, m_propertyWindow))
return FALSE;
}
node = node->Next();
bool wxPropertyFormView::TransferToPropertySheet(void)
{
- if (!propertySheet)
+ if (!m_propertySheet)
return FALSE;
- wxNode *node = propertySheet->GetProperties().First();
+ wxNode *node = m_propertySheet->GetProperties().First();
while (node)
{
wxProperty *prop = (wxProperty *)node->Data();
if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
{
wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- formValidator->OnRetrieveValue(prop, this, propertyWindow);
+ formValidator->OnRetrieveValue(prop, this, m_propertyWindow);
}
node = node->Next();
}
bool wxPropertyFormView::TransferToDialog(void)
{
- if (!propertySheet)
+ if (!m_propertySheet)
return FALSE;
- wxNode *node = propertySheet->GetProperties().First();
+ wxNode *node = m_propertySheet->GetProperties().First();
while (node)
{
wxProperty *prop = (wxProperty *)node->Data();
if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
{
wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- formValidator->OnDisplayValue(prop, this, propertyWindow);
+ formValidator->OnDisplayValue(prop, this, m_propertyWindow);
}
node = node->Next();
}
bool wxPropertyFormView::AssociateNames(void)
{
- if (!propertySheet || !propertyWindow)
+ if (!m_propertySheet || !m_propertyWindow)
return FALSE;
- wxNode *node = propertyWindow->GetChildren()->First();
+ wxNode *node = m_propertyWindow->GetChildren()->First();
while (node)
{
wxWindow *win = (wxWindow *)node->Data();
if (win->GetName() != "")
{
- wxProperty *prop = propertySheet->GetProperty(win->GetName());
+ wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
if (prop)
prop->SetWindow(win);
}
return TRUE;
}
-void wxPropertyFormView::OnOk(wxCommandEvent& event)
+void wxPropertyFormView::OnOk(wxCommandEvent& WXUNUSED(event))
{
// Retrieve the value if any
if (!Check())
return;
- dialogCancelled = FALSE;
+ sm_dialogCancelled = FALSE;
+ TransferToPropertySheet();
- managedWindow->Close(TRUE);
+ m_managedWindow->Close(TRUE);
}
-void wxPropertyFormView::OnCancel(wxCommandEvent& event)
+void wxPropertyFormView::OnCancel(wxCommandEvent& WXUNUSED(event))
{
- dialogCancelled = TRUE;
-
- managedWindow->Close(TRUE);
+ sm_dialogCancelled = TRUE;
+
+ m_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();
+ if (Check())
+ TransferToPropertySheet();
}
-void wxPropertyFormView::OnRevert(wxCommandEvent& event)
+void wxPropertyFormView::OnRevert(wxCommandEvent& WXUNUSED(event))
{
TransferToDialog();
}
void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event)
{
- if (!propertySheet)
+ if (!m_propertySheet)
return;
if (win.GetName() == "")
else
{
// Find a validator to route the command to.
- wxNode *node = propertySheet->GetProperties().First();
+ wxNode *node = m_propertySheet->GetProperties().First();
while (node)
{
wxProperty *prop = (wxProperty *)node->Data();
if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
{
wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- formValidator->OnCommand(prop, this, propertyWindow, event);
+ formValidator->OnCommand(prop, this, m_propertyWindow, event);
return;
}
}
void wxPropertyFormView::OnDoubleClick(wxControl *item)
{
- if (!propertySheet)
+ if (!m_propertySheet)
return;
// Find a validator to route the command to.
- wxNode *node = propertySheet->GetProperties().First();
+ wxNode *node = m_propertySheet->GetProperties().First();
while (node)
{
wxProperty *prop = (wxProperty *)node->Data();
if (validator && validator->IsKindOf(CLASSINFO(wxPropertyFormValidator)))
{
wxPropertyFormValidator *formValidator = (wxPropertyFormValidator *)validator;
- formValidator->OnDoubleClick(prop, this, propertyWindow);
+ formValidator->OnDoubleClick(prop, this, m_propertyWindow);
return;
}
}
const wxPoint& pos, const wxSize& size, long style, const wxString& name):
wxDialog(parent, -1, title, pos, size, style, name)
{
- view = v;
- view->AssociatePanel(this);
- view->SetManagedWindow(this);
+ m_view = v;
+ m_view->AssociatePanel(this);
+ m_view->SetManagedWindow(this);
// SetAutoLayout(TRUE);
}
bool wxPropertyFormDialog::OnClose(void)
{
- if (view)
+ if (m_view)
{
- view->OnClose();
- view = NULL;
+ m_view->OnClose();
+ m_view = NULL;
return TRUE;
}
else
void wxPropertyFormDialog::OnDefaultAction(wxControl *item)
{
- view->OnDoubleClick(item);
+ m_view->OnDoubleClick(item);
}
void wxPropertyFormDialog::OnCommand(wxWindow& win, wxCommandEvent& event)
{
- if ( view )
- view->OnCommand(win, event);
+ if ( m_view )
+ m_view->OnCommand(win, event);
}
// Extend event processing to search the view's event table
bool wxPropertyFormDialog::ProcessEvent(wxEvent& event)
{
- if ( !view || ! view->ProcessEvent(event) )
+ if ( !m_view || ! m_view->ProcessEvent(event) )
return wxEvtHandler::ProcessEvent(event);
else
return TRUE;
void wxPropertyFormPanel::OnDefaultAction(wxControl *item)
{
- view->OnDoubleClick(item);
+ m_view->OnDoubleClick(item);
}
void wxPropertyFormPanel::OnCommand(wxWindow& win, wxCommandEvent& event)
{
- view->OnCommand(win, event);
+ m_view->OnCommand(win, event);
}
// Extend event processing to search the view's event table
bool wxPropertyFormPanel::ProcessEvent(wxEvent& event)
{
- if ( !view || ! view->ProcessEvent(event) )
+ if ( !m_view || ! m_view->ProcessEvent(event) )
return wxEvtHandler::ProcessEvent(event);
else
return TRUE;
bool wxPropertyFormFrame::OnClose(void)
{
- if (view)
- return view->OnClose();
+ if (m_view)
+ return m_view->OnClose();
else
return FALSE;
}
bool wxPropertyFormFrame::Initialize(void)
{
- propertyPanel = OnCreatePanel(this, view);
- if (propertyPanel)
+ m_propertyPanel = OnCreatePanel(this, m_view);
+ if (m_propertyPanel)
{
- view->AssociatePanel(propertyPanel);
- view->SetManagedWindow(this);
-// propertyPanel->SetAutoLayout(TRUE);
+ m_view->AssociatePanel(m_propertyPanel);
+ m_view->SetManagedWindow(this);
return TRUE;
}
else
///
/// 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 (m_realMin == 0.0 && m_realMax == 0.0)
return TRUE;
// The item used for viewing the real number: should be a text item.
- wxWindow *propertyWindow = property->GetWindow();
- if (!propertyWindow || !propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
return FALSE;
- wxString value(((wxTextCtrl *)propertyWindow)->GetValue());
+ wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
float val = 0.0;
if (!StringToFloat(WXSTRINGCAST value, &val))
return FALSE;
}
- if (val < realMin || val > realMax)
+ if (val < m_realMin || val > m_realMax)
{
char buf[200];
- sprintf(buf, "Value must be a real number between %.2f and %.2f!", realMin, realMax);
+ sprintf(buf, "Value must be a real number between %.2f and %.2f!", m_realMin, m_realMax);
wxMessageBox(buf, "Property value error", wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
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();
- if (!propertyWindow || !propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
return FALSE;
- wxString value(((wxTextCtrl *)propertyWindow)->GetValue());
+ wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
if (value.Length() == 0)
return FALSE;
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();
- if (!propertyWindow || !propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
return FALSE;
- wxTextCtrl *textItem = (wxTextCtrl *)propertyWindow;
+ wxTextCtrl *textItem = (wxTextCtrl *)m_propertyWindow;
textItem->SetValue(FloatToString(property->GetValue().RealValue()));
return TRUE;
}
///
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 (m_integerMin == 0.0 && m_integerMax == 0.0)
return TRUE;
// The item used for viewing the real number: should be a text item or a slider
- wxWindow *propertyWindow = property->GetWindow();
- if (!propertyWindow)
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow)
return FALSE;
long val = 0;
- if (propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+ if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
{
- wxString value(((wxTextCtrl *)propertyWindow)->GetValue());
+ wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
if (!StringToLong(WXSTRINGCAST value, &val))
{
return FALSE;
}
}
- else if (propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
{
- val = (long)((wxSlider *)propertyWindow)->GetValue();
+ val = (long)((wxSlider *)m_propertyWindow)->GetValue();
}
else
return FALSE;
- if (val < integerMin || val > integerMax)
+ if (val < m_integerMin || val > m_integerMax)
{
char buf[200];
- sprintf(buf, "Value must be an integer between %ld and %ld!", integerMin, integerMax);
+ sprintf(buf, "Value must be an integer between %ld and %ld!", m_integerMin, m_integerMax);
wxMessageBox(buf, "Property value error", wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
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();
- if (!propertyWindow)
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow)
return FALSE;
- if (propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+ if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
{
- wxString value(((wxTextCtrl *)propertyWindow)->GetValue());
+ wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
if (value.Length() == 0)
return FALSE;
long i = atol((const char *)value);
property->GetValue() = i;
}
- else if (propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
{
- property->GetValue() = (long)((wxSlider *)propertyWindow)->GetValue();
+ property->GetValue() = (long)((wxSlider *)m_propertyWindow)->GetValue();
}
else
return FALSE;
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();
- if (!propertyWindow)
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow)
return FALSE;
- if (propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+ if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
{
- wxTextCtrl *textItem = (wxTextCtrl *)propertyWindow;
+ wxTextCtrl *textItem = (wxTextCtrl *)m_propertyWindow;
textItem->SetValue(LongToString(property->GetValue().IntegerValue()));
}
- else if (propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))
{
- ((wxSlider *)propertyWindow)->SetValue((int)property->GetValue().IntegerValue());
+ ((wxSlider *)m_propertyWindow)->SetValue((int)property->GetValue().IntegerValue());
}
else
return FALSE;
///
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();
- if (!propertyWindow || !propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
return FALSE;
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();
- if (!propertyWindow || !propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
return FALSE;
- wxCheckBox *checkBox = (wxCheckBox *)propertyWindow;
-
+ wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;
+
property->GetValue() = (bool)checkBox->GetValue();
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();
- if (!propertyWindow || !propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow || !m_propertyWindow->IsKindOf(CLASSINFO(wxCheckBox)))
return FALSE;
- wxCheckBox *checkBox = (wxCheckBox *)propertyWindow;
+ wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;
checkBox->SetValue((bool)property->GetValue().BoolValue());
return TRUE;
}
wxStringFormValidator::wxStringFormValidator(wxStringList *list, long flags):
wxPropertyFormValidator(flags)
{
- strings = list;
+ m_strings = list;
}
-bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow)
+bool wxStringFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormView *WXUNUSED(view),
+ wxWindow *parentWindow )
{
- if (!strings)
+ if (!m_strings)
return TRUE;
// The item used for viewing the string: should be a text item, choice item or listbox.
- wxWindow *propertyWindow = property->GetWindow();
- if (!propertyWindow)
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow)
return FALSE;
- if (propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+ if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
{
- wxTextCtrl *text = (wxTextCtrl *)propertyWindow;
- if (!strings->Member(text->GetValue()))
+ wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
+ if (!m_strings->Member(text->GetValue()))
{
wxString s("Value ");
s += text->GetValue();
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();
- if (!propertyWindow)
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow)
return FALSE;
- if (propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+ if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
{
- wxTextCtrl *text = (wxTextCtrl *)propertyWindow;
+ wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
property->GetValue() = text->GetValue();
}
- else if (propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
{
- wxListBox *lbox = (wxListBox *)propertyWindow;
+ wxListBox *lbox = (wxListBox *)m_propertyWindow;
if (lbox->GetSelection() > -1)
property->GetValue() = lbox->GetStringSelection();
}
/*
- else if (propertyWindow->IsKindOf(CLASSINFO(wxRadioBox)))
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxRadioBox)))
{
- wxRadioBox *rbox = (wxRadioBox *)propertyWindow;
+ wxRadioBox *rbox = (wxRadioBox *)m_propertyWindow;
int n = 0;
if ((n = rbox->GetSelection()) > -1)
property->GetValue() = rbox->GetString(n);
}
*/
- else if (propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
{
- wxChoice *choice = (wxChoice *)propertyWindow;
+ wxChoice *choice = (wxChoice *)m_propertyWindow;
if (choice->GetSelection() > -1)
property->GetValue() = choice->GetStringSelection();
}
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();
- if (!propertyWindow)
+ wxWindow *m_propertyWindow = property->GetWindow();
+ if (!m_propertyWindow)
return FALSE;
- if (propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+ if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
{
- wxTextCtrl *text = (wxTextCtrl *)propertyWindow;
+ wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
text->SetValue(property->GetValue().StringValue());
}
- else if (propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxListBox)))
{
- wxListBox *lbox = (wxListBox *)propertyWindow;
- if (lbox->Number() == 0 && strings)
+ wxListBox *lbox = (wxListBox *)m_propertyWindow;
+ if (lbox->Number() == 0 && m_strings)
{
// Try to initialize the listbox from 'strings'
- wxNode *node = strings->First();
+ wxNode *node = m_strings->First();
while (node)
{
char *s = (char *)node->Data();
lbox->SetStringSelection(property->GetValue().StringValue());
}
/*
- else if (propertyWindow->IsKindOf(CLASSINFO(wxRadioBox)))
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxRadioBox)))
{
- wxRadioBox *rbox = (wxRadioBox *)propertyWindow;
+ wxRadioBox *rbox = (wxRadioBox *)m_propertyWindow;
rbox->SetStringSelection(property->GetValue().StringValue());
}
*/
- else if (propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxChoice)))
{
- wxChoice *choice = (wxChoice *)propertyWindow;
+ wxChoice *choice = (wxChoice *)m_propertyWindow;
#ifndef __XVIEW__
- if (choice->Number() == 0 && strings)
+ if (choice->Number() == 0 && m_strings)
{
// Try to initialize the choice item from 'strings'
// XView doesn't allow this kind of thing.
- wxNode *node = strings->First();
+ wxNode *node = m_strings->First();
while (node)
{
char *s = (char *)node->Data();
projects / wxWidgets.git / blobdiff