#pragma hdrstop
#endif
+#if wxUSE_PROPSHEET
+
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/font.h"
// Property text edit control
// ----------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxPropertyTextEdit, wxTextCtrl)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyTextEdit, wxTextCtrl)
wxPropertyTextEdit::wxPropertyTextEdit(wxPropertyListView *v, wxWindow *parent,
const wxWindowID id, const wxString& value,
{
wxPanel *panel = (wxPanel *)m_propertyWindow;
- wxSize largeButtonSize( 60, 25 );
+ wxSize largeButtonSize( 70, 25 );
wxSize smallButtonSize( 23, 23 );
if (m_valueText)
m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxPoint(-1, -1), largeButtonSize );
m_windowCloseButton->SetDefault();
m_windowCloseButton->SetFocus();
- bottomsizer->Add( m_windowCloseButton, 0, wxLEFT|wxTOP|wxBOTTOM, buttonborder );
+ bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );
}
else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
{
bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
}
- mainsizer->Add( bottomsizer, 1, wxALIGN_RIGHT | wxEXPAND );
+ mainsizer->Add( bottomsizer, 0, wxALIGN_RIGHT | wxEXPAND );
}
panel->SetSizer( mainsizer );
// Property dialog box
// ----------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxPropertyListDialog, wxDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListDialog, wxDialog)
BEGIN_EVENT_TABLE(wxPropertyListDialog, wxDialog)
EVT_BUTTON(wxID_CANCEL, wxPropertyListDialog::OnCancel)
// Property panel
// ----------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxPropertyListPanel, wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListPanel, wxPanel)
BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
EVT_SIZE(wxPropertyListPanel::OnSize)
// Property frame
// ----------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxPropertyListFrame, wxFrame)
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyListFrame, wxFrame)
BEGIN_EVENT_TABLE(wxPropertyListFrame, wxFrame)
EVT_CLOSE(wxPropertyListFrame::OnCloseWindow)
bool wxPropertyListValidator::OnValueListSelect(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
{
wxString s(view->GetValueList()->GetStringSelection());
- if (s != T(""))
+ if (s != wxT(""))
{
view->GetValueText()->SetValue(s);
view->RetrieveProperty(property);
if (!StringToFloat(WXSTRINGCAST value, &val))
{
wxChar buf[200];
- wxSprintf(buf, T("Value %s is not a valid real number!"), value.GetData());
- wxMessageBox(buf, T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+ wxSprintf(buf, wxT("Value %s is not a valid real number!"), value.GetData());
+ wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
if (!StringToLong(WXSTRINGCAST value, &val))
{
wxChar buf[200];
- wxSprintf(buf, T("Value %s is not a valid integer!"), value.GetData());
- wxMessageBox(buf, T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+ wxSprintf(buf, wxT("Value %s is not a valid integer!"), value.GetData());
+ wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
if (val < m_integerMin || val > m_integerMax)
{
wxChar buf[200];
- wxSprintf(buf, T("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
- wxMessageBox(buf, T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+ wxSprintf(buf, wxT("Value must be an integer between %ld and %ld!"), m_integerMin, m_integerMax);
+ wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
return TRUE;
if (!view->GetValueText())
return FALSE;
wxString value(view->GetValueText()->GetValue());
- if (value != T("True") && value != T("False"))
+ if (value != wxT("True") && value != wxT("False"))
{
- wxMessageBox(T("Value must be True or False!"), T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+ wxMessageBox(wxT("Value must be True or False!"), wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
return FALSE;
}
return TRUE;
wxString value(view->GetValueText()->GetValue());
bool boolValue = FALSE;
- if (value == T("True"))
+ if (value == wxT("True"))
boolValue = TRUE;
else
boolValue = FALSE;
view->ShowListBoxControl(TRUE);
view->GetValueList()->Enable(TRUE);
- view->GetValueList()->Append(T("True"));
- view->GetValueList()->Append(T("False"));
+ view->GetValueList()->Append(wxT("True"));
+ view->GetValueList()->Append(wxT("False"));
wxChar *currentString = copystring(view->GetValueText()->GetValue());
view->GetValueList()->SetStringSelection(currentString);
delete[] currentString;
m_filenameWildCard.GetData(),
0,
parentWindow);
- if (s != T(""))
+ if (s != wxT(""))
{
property->GetValue() = s;
view->DisplayProperty(property);
expr = expr->GetNext();
}
- wxString title(T("Editing "));
+ wxString title(wxT("Editing "));
title += property->GetName();
if (EditStringList(parentWindow, stringList, title.GetData()))
{
SaveCurrentSelection();
- wxChar *initialText = T("");
+ wxChar *initialText = wxT("");
wxNode *node = m_stringList->Add(initialText);
m_listBox->Append(initialText, (void *)node);
m_currentSelection = m_stringList->Number() - 1;
{
s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
- #if defined(__WXMSW__) || defined(__WXOS2__)
+ #if defined(__WXMSW__) || defined(__WXPM__)
s_tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
#else
s_tickBitmap = new wxBitmap( tick_xpm );
{
s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
- #if defined(__WXMSW__) || defined(__WXOS2__)
+ #if defined(__WXMSW__) || defined(__WXPM__)
s_crossBitmap = new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
#else // XPMs
s_crossBitmap = new wxBitmap( cross_xpm );
return s_crossBitmap;
}
+#endif // wxUSE_PROPSHEET