/////////////////////////////////////////////////////////////////////////////
-// Name: proplist.cpp
+// Name: contrib/src/deprecated/proplist.cpp
// Purpose: Property list classes
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "proplist.h"
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
if (property == (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(i))
return i;
}
- return -1;
+ return wxNOT_FOUND;
}
wxString wxPropertyListView::MakeNameValueString(wxString name, wxString value)
wxString theString(name);
int nameWidth = 25;
- int padWith = nameWidth - theString.Length();
+ int padWith = nameWidth - theString.length();
if (padWith < 0)
padWith = 0;
if (select)
{
int sel = FindListIndexForProperty(property);
- if (sel > -1)
+ if (sel != wxNOT_FOUND)
m_propertyScrollingList->SetSelection(sel);
}
return true;
void wxPropertyListView::OnPropertySelect(wxCommandEvent& WXUNUSED(event))
{
int sel = m_propertyScrollingList->GetSelection();
- if (sel > -1)
+ if (sel != wxNOT_FOUND)
{
wxProperty *newSel = (wxProperty *)m_propertyScrollingList->wxListBox::GetClientData(sel);
if (newSel && newSel != m_currentProperty)
if (!panel)
return false;
- wxFont guiFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ wxFont guiFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
#ifdef __WXMSW__
wxFont *boringFont =
}
m_valueText = new wxPropertyTextEdit(this, panel, wxID_PROP_TEXT, wxEmptyString,
- wxDefaultPosition, wxSize(wxDefaultSize.x, smallButtonSize.y), wxPROCESS_ENTER);
+ wxDefaultPosition, wxSize(wxDefaultCoord, smallButtonSize.y), wxTE_PROCESS_ENTER);
m_valueText->Disable();
topsizer->Add( m_valueText, 1, wxALL | wxEXPAND, buttonborder );
m_middleSizer = new wxBoxSizer( wxVERTICAL );
- m_valueList = new wxListBox(panel, wxID_PROP_VALUE_SELECT, wxDefaultPosition, wxSize(wxDefaultSize.x, 60));
+ m_valueList = new wxListBox(panel, wxID_PROP_VALUE_SELECT, wxDefaultPosition, wxSize(wxDefaultCoord, 60));
m_valueList->Show(false);
m_propertyScrollingList = new wxListBox(panel, wxID_PROP_SELECT, wxDefaultPosition, wxSize(100, 100));
if (!view->GetValueText())
return;
- wxString s = wxFileSelector(
- m_filenameMessage.GetData(),
- wxPathOnly(property->GetValue().StringValue()),
- wxFileNameFromPath(property->GetValue().StringValue()),
- NULL,
- m_filenameWildCard.GetData(),
- 0,
- parentWindow);
- if ( !s.empty() )
- {
- property->GetValue() = s;
- view->DisplayProperty(property);
- view->UpdatePropertyDisplayInList(property);
- view->OnPropertyChanged(property);
- }
+#if wxUSE_FILEDLG
+ wxString s = wxFileSelector(
+ m_filenameMessage.GetData(),
+ wxPathOnly(property->GetValue().StringValue()),
+ wxFileNameFromPath(property->GetValue().StringValue()),
+ NULL,
+ m_filenameWildCard.GetData(),
+ 0,
+ parentWindow);
+ if ( !s.empty() )
+ {
+ property->GetValue() = s;
+ view->DisplayProperty(property);
+ view->UpdatePropertyDisplayInList(property);
+ view->OnPropertyChanged(property);
+ }
+#else
+ wxUnusedVar(property);
+ wxUnusedVar(view);
+ wxUnusedVar(parentWindow);
+#endif
}
///
return;
wxChar *s = property->GetValue().StringValue();
- int r = 0;
- int g = 0;
- int b = 0;
+ unsigned char r = 0;
+ unsigned char g = 0;
+ unsigned char b = 0;
if (s)
{
- r = wxHexToDec(s);
- g = wxHexToDec(s+2);
- b = wxHexToDec(s+4);
+ r = (unsigned char)wxHexToDec(s);
+ g = (unsigned char)wxHexToDec(s+2);
+ b = (unsigned char)wxHexToDec(s+4);
}
wxColour col(r,g,b);
for (int i = 0; i < 16; i++)
{
- wxColour colour(i*16, i*16, i*16);
+ wxColour colour((unsigned char)(i*16),
+ (unsigned char)(i*16),
+ (unsigned char)(i*16));
data.SetCustomColour(i, colour);
}
class wxPropertyStringListEditorDialog: public wxDialog
{
- public:
+public:
wxPropertyStringListEditorDialog(wxWindow *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long windowStyle = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("stringEditorDialogBox")):
wxDialog(parent, wxID_ANY, title, pos, size, windowStyle, name)
{
- m_stringList = NULL;
- m_stringText = NULL;
- m_listBox = NULL;
- sm_dialogCancelled = false;
- m_currentSelection = -1;
+ m_stringList = NULL;
+ m_stringText = NULL;
+ m_listBox = NULL;
+ sm_dialogCancelled = false;
+ m_currentSelection = -1;
}
~wxPropertyStringListEditorDialog(void) {}
void OnCloseWindow(wxCloseEvent& event);
dialog->m_stringText = new wxPropertyStringListEditorText(dialog,
wxID_PROP_SL_TEXT, wxEmptyString, wxPoint(5, 240),
- wxSize(300, wxDefaultSize.y), wxPROCESS_ENTER);
+ wxSize(300, wxDefaultCoord), wxTE_PROCESS_ENTER);
dialog->m_stringText->Disable();
wxButton *addButton = new wxButton(dialog, wxID_PROP_SL_ADD, wxT("Add"), wxDefaultPosition, wxSize(largeButtonWidth, largeButtonHeight));
void wxPropertyStringListEditorDialog::OnStrings(wxCommandEvent& WXUNUSED(event))
{
- int sel = m_listBox->GetSelection();
- if (sel > -1)
- {
- m_currentSelection = sel;
+ int sel = m_listBox->GetSelection();
+ if (sel != wxNOT_FOUND)
+ {
+ m_currentSelection = sel;
- ShowCurrentSelection();
- }
+ ShowCurrentSelection();
+ }
}
void wxPropertyStringListEditorDialog::OnDelete(wxCommandEvent& WXUNUSED(event))
{
- int sel = m_listBox->GetSelection();
- if (sel == -1)
- return;
+ int sel = m_listBox->GetSelection();
+ if (sel == wxNOT_FOUND)
+ return;
- wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(sel);
- if (!node)
- return;
+ wxNode *node = (wxNode *)m_listBox->wxListBox::GetClientData(sel);
+ if (!node)
+ return;
- m_listBox->Delete(sel);
- delete[] (wxChar *)node->GetData();
- delete node;
- m_currentSelection = -1;
- m_stringText->SetValue(wxEmptyString);
+ m_listBox->Delete(sel);
+ delete[] (wxChar *)node->GetData();
+ delete node;
+ m_currentSelection = -1;
+ m_stringText->SetValue(wxEmptyString);
}
void wxPropertyStringListEditorDialog::OnAdd(wxCommandEvent& WXUNUSED(event))
void wxPropertyStringListEditorDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{
- SaveCurrentSelection();
- EndModal(wxID_OK);
- // Close(true);
- this->Destroy();
+ SaveCurrentSelection();
+ EndModal(wxID_OK);
+// Close(true);
+ this->Destroy();
}
void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
{
- sm_dialogCancelled = true;
- EndModal(wxID_CANCEL);
+ sm_dialogCancelled = true;
+ EndModal(wxID_CANCEL);
// Close(true);
- this->Destroy();
+ this->Destroy();
}
void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
{
- if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
- {
- SaveCurrentSelection();
- }
+ if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
+ {
+ SaveCurrentSelection();
+ }
}
void
wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
- SaveCurrentSelection();
+ SaveCurrentSelection();
- Destroy();
+ Destroy();
}
void wxPropertyStringListEditorDialog::SaveCurrentSelection()
projects / wxWidgets.git / blobdiff