// IF the property value was modified.
if (property->GetValue().GetModified())
{
- propertyInfo->SetProperty(property->GetName(), property);
+ m_propertyInfo->SetProperty(property->GetName(), property);
property->GetValue().SetModified(FALSE);
+ wxResourceManager::GetCurrentResourceManager()->Modify(TRUE);
}
}
* wxDialogEditorPropertyListDialog
*/
+ /*
wxDialogEditorPropertyListDialog::wxDialogEditorPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
const wxPoint& pos, const wxSize& size,
long style, const wxString& name):
delete m_propInfo;
wxPropertyInfo::sm_propertyWindow = NULL;
}
+*/
+
+wxDialogEditorPropertyListFrame::wxDialogEditorPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
+ const wxPoint& pos, const wxSize& size,
+ long style, const wxString& name):
+ wxPropertyListFrame(v, parent, title, pos, size, style, name)
+{
+ m_propSheet = NULL;
+ m_propInfo = NULL;
+}
+
+wxDialogEditorPropertyListFrame::~wxDialogEditorPropertyListFrame()
+{
+ delete m_propSheet;
+ delete m_propInfo;
+ wxPropertyInfo::sm_propertyWindow = NULL;
+}
/*
* wxPropertyInfo
// Edit the information represented by this object, whatever that
// might be.
-bool wxPropertyInfo::Edit(wxWindow *parent, const wxString& title)
+bool wxPropertyInfo::Edit(wxWindow *WXUNUSED(parent), const wxString& title)
{
if (sm_propertyWindow)
- return FALSE;
+ {
+ sm_propertyWindow->Raise();
+ return TRUE;
+ }
int width = wxResourceManager::GetCurrentResourceManager()->GetPropertyWindowSize().width;
int height = wxResourceManager::GetCurrentResourceManager()->GetPropertyWindowSize().height;
propSheet->SetAllModified(FALSE);
wxResourcePropertyListView *view = new wxResourcePropertyListView(this, NULL,
-#ifdef __XVIEW__
wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL |
-#endif
wxPROP_BUTTON_CHECK_CROSS|wxPROP_DYNAMIC_VALUE_FIELD|wxPROP_PULLDOWN|wxPROP_SHOWVALUES);
- wxDialogEditorPropertyListDialog *propDialog = new wxDialogEditorPropertyListDialog(view,
+ wxDialogEditorPropertyListFrame *propWin = new wxDialogEditorPropertyListFrame(view,
wxResourceManager::GetCurrentResourceManager()->GetEditorFrame(), title, wxPoint(x, y),
- wxSize(width, height), wxDEFAULT_DIALOG_STYLE);
- sm_propertyWindow = propDialog;
+ wxSize(width, height), wxDEFAULT_FRAME_STYLE);
+ sm_propertyWindow = propWin;
+
+ propWin->m_registry.RegisterValidator(wxString("real"), new wxRealListValidator);
+ propWin->m_registry.RegisterValidator(wxString("string"), new wxStringListValidator);
+ propWin->m_registry.RegisterValidator(wxString("integer"), new wxIntegerListValidator);
+ propWin->m_registry.RegisterValidator(wxString("bool"), new wxBoolListValidator);
+ propWin->m_registry.RegisterValidator(wxString("filename"), new wxFilenameListValidator);
+ propWin->m_registry.RegisterValidator(wxString("stringlist"), new wxListOfStringsListValidator);
+ propWin->m_registry.RegisterValidator(wxString("window_id"), new wxResourceSymbolValidator);
- propDialog->m_registry.RegisterValidator((wxString)"real", new wxRealListValidator);
- propDialog->m_registry.RegisterValidator((wxString)"string", new wxStringListValidator);
- propDialog->m_registry.RegisterValidator((wxString)"integer", new wxIntegerListValidator);
- propDialog->m_registry.RegisterValidator((wxString)"bool", new wxBoolListValidator);
- propDialog->m_registry.RegisterValidator((wxString)"filename", new wxFilenameListValidator);
- propDialog->m_registry.RegisterValidator((wxString)"stringlist", new wxListOfStringsListValidator);
- propDialog->m_registry.RegisterValidator((wxString)"window_id", new wxResourceSymbolValidator);
+ propWin->m_propInfo = this;
+ propWin->m_propSheet = propSheet;
- propDialog->m_propInfo = this;
- propDialog->m_propSheet = propSheet;
+// view->m_propertyWindow = propWin;
+ view->AddRegistry(&(propWin->m_registry));
-// view->propertyWindow = propDialog;
- view->AddRegistry(&(propDialog->m_registry));
- view->ShowView(propSheet, propDialog);
+ propWin->Initialize();
+ view->ShowView(propSheet, propWin->GetPropertyPanel());
- propDialog->Show(TRUE);
+ propWin->Show(TRUE);
return TRUE;
}
wxWindowPropertyInfo::wxWindowPropertyInfo(wxWindow *win, wxItemResource *res)
{
- propertyWindow = win;
- propertyResource = res;
+ m_propertyWindow = win;
+ m_propertyResource = res;
}
wxWindowPropertyInfo::~wxWindowPropertyInfo(void)
wxProperty *wxWindowPropertyInfo::GetProperty(wxString& name)
{
- wxFont *font = propertyWindow->GetFont();
+ wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
+
+ wxFont *font = m_propertyWindow->GetFont();
if (name == "fontPoints" || name == "fontFamily" || name == "fontStyle" || name == "fontWeight" ||
name == "fontUnderlined")
return GetFontProperty(name, font);
else if (name == "name")
- return new wxProperty("name", propertyWindow->GetName(), "string");
+ return new wxProperty("name", m_propertyWindow->GetName(), "string");
else if (name == "title")
- return new wxProperty("title", propertyWindow->GetTitle(), "string");
+ return new wxProperty("title", m_propertyWindow->GetTitle(), "string");
else if (name == "x")
{
- int x, y;
- propertyWindow->GetPosition(&x, &y);
- return new wxProperty("x", (long)x, "integer");
+ return new wxProperty("x", (long)resource->GetX(), "integer");
}
else if (name == "y")
{
- int x, y;
- propertyWindow->GetPosition(&x, &y);
- return new wxProperty("y", (long)y, "integer");
+ return new wxProperty("y", (long)resource->GetY(), "integer");
}
else if (name == "width")
{
- int width, height;
- propertyWindow->GetSize(&width, &height);
- return new wxProperty("width", (long)width, "integer");
+ return new wxProperty("width", (long)resource->GetWidth(), "integer");
}
else if (name == "height")
{
- int width, height;
- propertyWindow->GetSize(&width, &height);
- return new wxProperty("height", (long)height, "integer");
+ return new wxProperty("width", (long)resource->GetHeight(), "integer");
}
else if (name == "id")
{
- wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(propertyWindow);
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
if (resource)
{
int id = resource->GetId();
else
return NULL;
}
+ else if (name == "border")
+ {
+ wxString border("");
+ if (m_propertyWindow->GetWindowStyleFlag() & wxSIMPLE_BORDER)
+ border = "wxSIMPLE_BORDER";
+ else if (m_propertyWindow->GetWindowStyleFlag() & wxRAISED_BORDER)
+ border = "wxRAISED_BORDER";
+ else if (m_propertyWindow->GetWindowStyleFlag() & wxSUNKEN_BORDER)
+ border = "wxSUNKEN_BORDER";
+ else if (m_propertyWindow->GetWindowStyleFlag() & wxDOUBLE_BORDER)
+ border = "wxDOUBLE_BORDER";
+ else if (m_propertyWindow->GetWindowStyleFlag() & wxSTATIC_BORDER)
+ border = "wxSTATIC_BORDER";
+ else
+ border = "wxNO_BORDER";
+
+ return new wxProperty("border", border, "string",
+ new wxStringListValidator(new wxStringList("wxSIMPLE_BORDER", "wxRAISED_BORDER",
+ "wxSUNKEN_BORDER", "wxDOUBLE_BORDER", "wxSTATIC_BORDER", "wxNO_BORDER", NULL)));
+ }
else
return NULL;
}
bool wxWindowPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxFont *font = propertyWindow->GetFont();
+ wxFont *font = m_propertyWindow->GetFont();
if (font && (name == "fontPoints" || name == "fontFamily" || name == "fontStyle" || name == "fontWeight" || name == "fontUnderlined" ))
{
wxFont *newFont = SetFontProperty(name, property, font);
if (newFont)
- propertyWindow->SetFont(newFont);
+ m_propertyWindow->SetFont(newFont);
return TRUE;
}
else if (name == "name")
{
// Remove old name from resource table, if it's there.
- wxItemResource *oldResource = (wxItemResource *)wxResourceManager::GetCurrentResourceManager()->GetResourceTable().Delete(propertyWindow->GetName());
+ wxItemResource *oldResource = (wxItemResource *)wxResourceManager::GetCurrentResourceManager()->GetResourceTable().Delete(m_propertyWindow->GetName());
if (oldResource)
{
// It's a top-level resource
- propertyWindow->SetName(property->GetValue().StringValue());
+ m_propertyWindow->SetName(property->GetValue().StringValue());
oldResource->SetName(property->GetValue().StringValue());
- wxResourceManager::GetCurrentResourceManager()->GetResourceTable().Put(propertyWindow->GetName(), oldResource);
+ wxResourceManager::GetCurrentResourceManager()->GetResourceTable().Put(m_propertyWindow->GetName(), oldResource);
}
else
{
// It's a child of something; just set the name of the resource and the window.
- propertyWindow->SetName(property->GetValue().StringValue());
- propertyResource->SetName(property->GetValue().StringValue());
+ m_propertyWindow->SetName(property->GetValue().StringValue());
+ m_propertyResource->SetName(property->GetValue().StringValue());
}
// Refresh the resource manager list, because the name changed.
wxResourceManager::GetCurrentResourceManager()->UpdateResourceList();
}
else if (name == "title")
{
- propertyWindow->SetTitle(property->GetValue().StringValue());
+ m_propertyWindow->SetTitle(property->GetValue().StringValue());
return TRUE;
}
else if (name == "x")
{
int x, y;
- propertyWindow->GetPosition(&x, &y);
+ m_propertyWindow->GetPosition(&x, &y);
int newX = (int)property->GetValue().IntegerValue();
+
+ // We need to convert to pixels if this is not a dialog or panel, but
+ // the parent resource specifies dialog units.
+ if (m_propertyWindow->GetParent() && m_propertyWindow->IsKindOf(CLASSINFO(wxControl)))
+ {
+ wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow->GetParent());
+ if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxPoint pt = m_propertyWindow->GetParent()->ConvertDialogToPixels(wxPoint(newX, y));
+ newX = pt.x;
+ }
+ }
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxPanel)))
+ {
+ wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
+ if (resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxPoint pt = m_propertyWindow->ConvertDialogToPixels(wxPoint(newX, y));
+ newX = pt.x;
+ }
+ }
+
if (x != newX)
- propertyWindow->Move(newX, y);
+ m_propertyWindow->Move(newX, y);
return TRUE;
}
else if (name == "y")
{
int x, y;
- propertyWindow->GetPosition(&x, &y);
+ m_propertyWindow->GetPosition(&x, &y);
int newY = (int)property->GetValue().IntegerValue();
+
+ // We need to convert to pixels if this is not a dialog or panel, but
+ // the parent resource specifies dialog units.
+ if (m_propertyWindow->GetParent() && m_propertyWindow->IsKindOf(CLASSINFO(wxControl)))
+ {
+ wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow->GetParent());
+ if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxPoint pt = m_propertyWindow->GetParent()->ConvertDialogToPixels(wxPoint(x, newY));
+ newY = pt.y;
+ }
+ }
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxPanel)))
+ {
+ wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
+ if (resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxPoint pt = m_propertyWindow->ConvertDialogToPixels(wxPoint(x, newY));
+ newY = pt.y;
+ }
+ }
+
if (y != newY)
- propertyWindow->Move(x, newY);
+ m_propertyWindow->Move(x, newY);
return TRUE;
}
else if (name == "width")
{
int width, height;
- propertyWindow->GetSize(&width, &height);
+ m_propertyWindow->GetSize(&width, &height);
int newWidth = (int)property->GetValue().IntegerValue();
+
+ // We need to convert to pixels if this is not a dialog or panel, but
+ // the parent resource specifies dialog units.
+ if (m_propertyWindow->GetParent() && m_propertyWindow->IsKindOf(CLASSINFO(wxControl)))
+ {
+ wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow->GetParent());
+ if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxSize sz = m_propertyWindow->GetParent()->ConvertDialogToPixels(wxSize(newWidth, height));
+ newWidth = sz.x;
+ }
+ }
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxPanel)))
+ {
+ wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
+ if (resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxSize sz = m_propertyWindow->ConvertDialogToPixels(wxSize(newWidth, height));
+ newWidth = sz.x;
+ }
+ }
+
if (width != newWidth)
{
- propertyWindow->SetSize(newWidth, height);
-/*
- if (propertyWindow->IsKindOf(CLASSINFO(wxPanel)) && !propertyWindow->IsKindOf(CLASSINFO(wxDialog)))
- {
- propertyWindow->GetParent()->SetClientSize(newWidth, height);
- }
-*/
+ m_propertyWindow->SetSize(newWidth, height);
}
return TRUE;
}
else if (name == "height")
{
int width, height;
- propertyWindow->GetSize(&width, &height);
+ m_propertyWindow->GetSize(&width, &height);
int newHeight = (int)property->GetValue().IntegerValue();
+
+ // We need to convert to pixels if this is not a dialog or panel, but
+ // the parent resource specifies dialog units.
+ if (m_propertyWindow->GetParent() && m_propertyWindow->IsKindOf(CLASSINFO(wxControl)))
+ {
+ wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow->GetParent());
+ if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxSize sz = m_propertyWindow->GetParent()->ConvertDialogToPixels(wxSize(width, newHeight));
+ newHeight = sz.y;
+ }
+ }
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxPanel)))
+ {
+ wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
+ if (resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxSize sz = m_propertyWindow->ConvertDialogToPixels(wxSize(width, newHeight));
+ newHeight = sz.y;
+ }
+ }
+
if (height != newHeight)
{
- propertyWindow->SetSize(width, newHeight);
-/*
- if (propertyWindow->IsKindOf(CLASSINFO(wxPanel)) && !propertyWindow->IsKindOf(CLASSINFO(wxDialog)))
- {
- propertyWindow->GetParent()->SetClientSize(width, newHeight);
- }
-*/
+ m_propertyWindow->SetSize(width, newHeight);
}
return TRUE;
}
else if (name == "id")
{
- wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(propertyWindow);
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
if (resource)
{
wxString value = property->GetValue().StringValue();
else
return FALSE;
}
+ else if (name == "border")
+ {
+ long borderStyle = wxNO_BORDER;
+ wxString val = property->GetValue().StringValue();
+
+ if (val == "wxSIMPLE_BORDER")
+ borderStyle = wxSIMPLE_BORDER;
+ else if (val == "wxRAISED_BORDER")
+ borderStyle = wxRAISED_BORDER;
+ else if (val == "wxSUNKEN_BORDER")
+ borderStyle = wxSUNKEN_BORDER;
+ else if (val == "wxDOUBLE_BORDER")
+ borderStyle = wxDOUBLE_BORDER;
+ else if (val == "wxSTATIC_BORDER")
+ borderStyle = wxSTATIC_BORDER;
+ else
+ borderStyle = wxNO_BORDER;
+
+ SetWindowStyle(m_propertyWindow, wxSIMPLE_BORDER, FALSE);
+ SetWindowStyle(m_propertyWindow, wxRAISED_BORDER, FALSE);
+ SetWindowStyle(m_propertyWindow, wxSUNKEN_BORDER, FALSE);
+ SetWindowStyle(m_propertyWindow, wxDOUBLE_BORDER, FALSE);
+ SetWindowStyle(m_propertyWindow, wxSTATIC_BORDER, FALSE);
+ SetWindowStyle(m_propertyWindow, wxNO_BORDER, FALSE);
+
+ SetWindowStyle(m_propertyWindow, borderStyle, TRUE);
+
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
+ resource->SetStyle(m_propertyWindow->GetWindowStyleFlag());
+ return TRUE;
+ }
else
return FALSE;
}
names.Add("y");
names.Add("width");
names.Add("height");
- if (!propertyWindow->IsKindOf(CLASSINFO(wxControl)))
+ names.Add("border");
+ if (!m_propertyWindow->IsKindOf(CLASSINFO(wxControl)))
{
names.Add("fontPoints");
names.Add("fontFamily");
// Fill in the wxItemResource members to mirror the current window settings
bool wxWindowPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- resource->SetType(propertyWindow->GetClassInfo()->GetClassName());
-
-// resource->SetStyle(propertyWindow->GetWindowStyleFlag());
- wxString str(propertyWindow->GetName());
- resource->SetName(WXSTRINGCAST str);
+// resource->SetType(m_propertyWindow->GetClassInfo()->GetClassName());
+
+// resource->SetStyle(m_propertyWindow->GetWindowStyleFlag());
+ wxString str(m_propertyWindow->GetName());
+ resource->SetName(str);
+
+#if 0
int x, y, w, h;
- propertyWindow->GetSize(&w, &h);
- propertyWindow->GetPosition(&x, &y);
+ if (m_propertyWindow->IsKindOf(CLASSINFO(wxPanel)))
+ m_propertyWindow->GetClientSize(&w, &h);
+ else
+ m_propertyWindow->GetSize(&w, &h);
+
+ m_propertyWindow->GetPosition(&x, &y);
+
+ // We need to convert to dialog units if this is not a dialog or panel, but
+ // the parent resource specifies dialog units.
+ if (m_propertyWindow->GetParent() && m_propertyWindow->IsKindOf(CLASSINFO(wxControl)))
+ {
+ wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow->GetParent());
+ if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxPoint pt = m_propertyWindow->GetParent()->ConvertPixelsToDialog(wxPoint(x, y));
+ x = pt.x; y = pt.y;
+ wxSize sz = m_propertyWindow->GetParent()->ConvertPixelsToDialog(wxSize(w, h));
+ w = sz.x; h = sz.y;
+ }
+ }
+ else if (m_propertyWindow->IsKindOf(CLASSINFO(wxPanel)))
+ {
+ if (resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxPoint pt = m_propertyWindow->ConvertPixelsToDialog(wxPoint(x, y));
+ x = pt.x; y = pt.y;
+ wxSize sz = m_propertyWindow->ConvertPixelsToDialog(wxSize(w, h));
+ w = sz.x; h = sz.y;
+ }
+ }
+
resource->SetSize(x, y, w, h);
+#endif
+
return TRUE;
}
+// Set the window style
+void wxWindowPropertyInfo::SetWindowStyle(wxWindow* win, long style, bool set)
+{
+ if (style == 0)
+ return;
+
+ if ((win->GetWindowStyleFlag() & style) == style)
+ {
+ if (!set)
+ {
+ win->SetWindowStyleFlag(win->GetWindowStyleFlag() - style);
+ }
+ }
+ else
+ {
+ if (set)
+ {
+ win->SetWindowStyleFlag(win->GetWindowStyleFlag() | style);
+ }
+ }
+}
/*
* Controls
wxProperty *wxItemPropertyInfo::GetProperty(wxString& name)
{
- wxControl *itemWindow = (wxControl *)propertyWindow;
+ wxControl *itemWindow = (wxControl *)m_propertyWindow;
wxFont *font = itemWindow->GetFont();
if (name == "fontPoints" || name == "fontFamily" || name == "fontStyle" || name == "fontWeight" ||
name == "fontUnderlined")
return GetFontProperty(name, font);
else if (name == "label" && itemWindow->GetLabel())
- return new wxProperty("label", propertyWindow->GetLabel(), "string");
+ return new wxProperty("label", m_propertyWindow->GetLabel(), "string");
else
return wxWindowPropertyInfo::GetProperty(name);
}
bool wxItemPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxControl *itemWindow = (wxControl *)propertyWindow;
+ wxControl *itemWindow = (wxControl *)m_propertyWindow;
wxFont *font = itemWindow->GetFont();
if (font && (name == "fontPoints" || name == "fontFamily" || name == "fontStyle" || name == "fontWeight" || name == "fontUnderlined" ))
{
wxWindowPropertyInfo::InstantiateResource(resource);
- wxControl *item = (wxControl *)propertyWindow;
+ wxControl *item = (wxControl *)m_propertyWindow;
wxString str(item->GetLabel());
- resource->SetTitle(WXSTRINGCAST str);
+ resource->SetTitle(str);
if (item->GetFont() && item->GetFont()->Ok())
resource->SetFont(wxTheFontList->FindOrCreateFont(item->GetFont()->GetPointSize(),
item->GetFont()->GetFamily(), item->GetFont()->GetStyle(), item->GetFont()->GetWeight(),
wxProperty *wxButtonPropertyInfo::GetProperty(wxString& name)
{
- wxButton *button = (wxButton *)propertyWindow;
return wxItemPropertyInfo::GetProperty(name);
}
bool wxButtonPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxButton *button = (wxButton *)propertyWindow;
return wxItemPropertyInfo::SetProperty(name, property);
}
void wxButtonPropertyInfo::GetPropertyNames(wxStringList& names)
{
- names.Add("label");
wxItemPropertyInfo::GetPropertyNames(names);
+ names.Add("label");
}
bool wxButtonPropertyInfo::InstantiateResource(wxItemResource *resource)
wxProperty *wxBitmapButtonPropertyInfo::GetProperty(wxString& name)
{
- wxBitmapButton *button = (wxBitmapButton *)propertyWindow;
+ wxBitmapButton *button = (wxBitmapButton *)m_propertyWindow;
if (name == "label")
{
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(button);
if (resource)
{
- char *filename = wxResourceManager::GetCurrentResourceManager()->FindBitmapFilenameForResource(resource);
- if (filename)
- str = filename;
+ str = wxResourceManager::GetCurrentResourceManager()->FindBitmapFilenameForResource(resource);
}
return new wxProperty("label", str.GetData(), "string", new wxFilenameListValidator("Select a bitmap file", "*.bmp"));
}
bool wxBitmapButtonPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxBitmapButton *button = (wxBitmapButton *)propertyWindow;
+ wxBitmapButton *button = (wxBitmapButton *)m_propertyWindow;
if (name == "label")
{
char *s = property->GetValue().StringValue();
if (resource)
{
wxString oldResource(resource->GetValue4());
- char *resName = wxResourceManager::GetCurrentResourceManager()->AddBitmapResource(s);
+ wxString resName = wxResourceManager::GetCurrentResourceManager()->AddBitmapResource(s);
resource->SetValue4(resName);
if (!oldResource.IsNull())
- wxResourceManager::GetCurrentResourceManager()->PossiblyDeleteBitmapResource(WXSTRINGCAST oldResource);
+ wxResourceManager::GetCurrentResourceManager()->PossiblyDeleteBitmapResource(oldResource);
}
button->SetLabel(bitmap);
wxProperty *wxStaticTextPropertyInfo::GetProperty(wxString& name)
{
- wxStaticText *message = (wxStaticText *)propertyWindow;
return wxItemPropertyInfo::GetProperty(name);
}
bool wxStaticTextPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxStaticText *message = (wxStaticText *)propertyWindow;
return wxItemPropertyInfo::SetProperty(name, property);
}
void wxStaticTextPropertyInfo::GetPropertyNames(wxStringList& names)
{
- names.Add("label");
wxItemPropertyInfo::GetPropertyNames(names);
+ names.Add("label");
}
bool wxStaticTextPropertyInfo::InstantiateResource(wxItemResource *resource)
wxProperty *wxStaticBitmapPropertyInfo::GetProperty(wxString& name)
{
- wxStaticBitmap *message = (wxStaticBitmap *)propertyWindow;
+ wxStaticBitmap *message = (wxStaticBitmap *)m_propertyWindow;
if (name == "label")
{
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(message);
if (resource)
{
- char *filename = wxResourceManager::GetCurrentResourceManager()->FindBitmapFilenameForResource(resource);
- if (filename)
- str = filename;
+ str = wxResourceManager::GetCurrentResourceManager()->FindBitmapFilenameForResource(resource);
}
return new wxProperty("label", str.GetData(), "string", new wxFilenameListValidator("Select a bitmap file", "*.bmp"));
}
bool wxStaticBitmapPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxStaticBitmap *message = (wxStaticBitmap *)propertyWindow;
+ wxStaticBitmap *message = (wxStaticBitmap *)m_propertyWindow;
if (name == "label")
{
char *s = property->GetValue().StringValue();
if (resource)
{
wxString oldResource(resource->GetValue4());
- char *resName = wxResourceManager::GetCurrentResourceManager()->AddBitmapResource(s);
+ wxString resName = wxResourceManager::GetCurrentResourceManager()->AddBitmapResource(s);
resource->SetValue4(resName);
if (!oldResource.IsNull())
- wxResourceManager::GetCurrentResourceManager()->PossiblyDeleteBitmapResource(WXSTRINGCAST oldResource);
+ wxResourceManager::GetCurrentResourceManager()->PossiblyDeleteBitmapResource(oldResource);
}
message->SetBitmap(bitmap);
void wxStaticBitmapPropertyInfo::GetPropertyNames(wxStringList& names)
{
- names.Add("label");
wxItemPropertyInfo::GetPropertyNames(names);
+ names.Add("label");
}
bool wxStaticBitmapPropertyInfo::InstantiateResource(wxItemResource *resource)
wxProperty *wxTextPropertyInfo::GetProperty(wxString& name)
{
- wxTextCtrl *text = (wxTextCtrl *)propertyWindow;
+ wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
if (name == "value")
return new wxProperty("value", text->GetValue(), "string");
else if (name == "password")
bool wxTextPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxTextCtrl *text = (wxTextCtrl *)propertyWindow;
+ wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
if (name == "value")
{
text->SetValue(property->GetValue().StringValue());
void wxTextPropertyInfo::GetPropertyNames(wxStringList& names)
{
+ wxItemPropertyInfo::GetPropertyNames(names);
names.Add("value");
names.Add("readonly");
names.Add("password");
- wxItemPropertyInfo::GetPropertyNames(names);
}
bool wxTextPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxTextCtrl *text = (wxTextCtrl *)propertyWindow;
+ wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
wxString str(text->GetValue());
- resource->SetValue4(WXSTRINGCAST str);
+ resource->SetValue4(str);
return wxItemPropertyInfo::InstantiateResource(resource);
}
wxProperty *wxListBoxPropertyInfo::GetProperty(wxString& name)
{
- wxListBox *listBox = (wxListBox *)propertyWindow;
+ wxListBox *listBox = (wxListBox *)m_propertyWindow;
if (name == "values")
{
wxStringList *stringList = new wxStringList;
}
else if (name == "multiple")
{
- char *pos = NULL;
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(listBox);
if (!resource)
return NULL;
bool wxListBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxListBox *listBox = (wxListBox *)propertyWindow;
+ wxListBox *listBox = (wxListBox *)m_propertyWindow;
if (name == "values")
{
listBox->Clear();
void wxListBoxPropertyInfo::GetPropertyNames(wxStringList& names)
{
+ wxItemPropertyInfo::GetPropertyNames(names);
names.Add("values");
names.Add("multiple");
- wxItemPropertyInfo::GetPropertyNames(names);
}
bool wxListBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxListBox *lbox = (wxListBox *)propertyWindow;
+ wxListBox *lbox = (wxListBox *)m_propertyWindow;
// This will be set for the wxItemResource on reading or in SetProperty
// resource->SetValue1(lbox->GetSelectionMode());
int i;
resource->SetStringValues(NULL);
else
{
- wxStringList *slist = new wxStringList;
+ wxStringList slist;
for (i = 0; i < lbox->Number(); i++)
- slist->Add(lbox->GetString(i));
+ slist.Add(lbox->GetString(i));
resource->SetStringValues(slist);
}
wxProperty *wxChoicePropertyInfo::GetProperty(wxString& name)
{
- wxChoice *choice = (wxChoice *)propertyWindow;
+ wxChoice *choice = (wxChoice *)m_propertyWindow;
if (name == "values")
{
- wxStringList *stringList = new wxStringList;
+ wxStringList* stringList = new wxStringList;
int i;
for (i = 0; i < choice->Number(); i++)
stringList->Add(choice->GetString(i));
bool wxChoicePropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxChoice *choice = (wxChoice *)propertyWindow;
+ wxChoice *choice = (wxChoice *)m_propertyWindow;
if (name == "values")
{
choice->Clear();
void wxChoicePropertyInfo::GetPropertyNames(wxStringList& names)
{
- names.Add("values");
wxItemPropertyInfo::GetPropertyNames(names);
+ names.Add("values");
}
bool wxChoicePropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxChoice *choice = (wxChoice *)propertyWindow;
+ wxChoice *choice = (wxChoice *)m_propertyWindow;
int i;
if (choice->Number() == 0)
resource->SetStringValues(NULL);
else
{
- wxStringList *slist = new wxStringList;
+ wxStringList slist;
for (i = 0; i < choice->Number(); i++)
- slist->Add(choice->GetString(i));
+ slist.Add(choice->GetString(i));
+
+ resource->SetStringValues(slist);
+ }
+ return wxItemPropertyInfo::InstantiateResource(resource);
+}
+
+/*
+ * Choice item
+ */
+
+wxProperty *wxComboBoxPropertyInfo::GetProperty(wxString& name)
+{
+ wxComboBox *choice = (wxComboBox *)m_propertyWindow;
+ if (name == "values")
+ {
+ wxStringList *stringList = new wxStringList;
+ int i;
+ for (i = 0; i < choice->Number(); i++)
+ stringList->Add(choice->GetString(i));
+
+ return new wxProperty(name, stringList, "stringlist");
+ }
+ else if (name == "sort")
+ {
+ bool sort = ((m_propertyWindow->GetWindowStyleFlag() & wxCB_SORT) == wxCB_SORT);
+ return new wxProperty(name, sort, "bool");
+ }
+ else if (name == "style")
+ {
+ wxString styleStr("dropdown");
+ if (m_propertyWindow->GetWindowStyleFlag() & wxCB_SIMPLE)
+ styleStr = "simple";
+ else if (m_propertyWindow->GetWindowStyleFlag() & wxCB_READONLY)
+ styleStr = "readonly";
+ else
+ styleStr = "dropdown";
+
+ return new wxProperty(name, styleStr, "string",
+ new wxStringListValidator(new wxStringList("simple", "dropdown", "readonly",
+ NULL)));
+ }
+ else
+ return wxItemPropertyInfo::GetProperty(name);
+}
+
+bool wxComboBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
+{
+ wxComboBox *choice = (wxComboBox *)m_propertyWindow;
+ if (name == "values")
+ {
+ choice->Clear();
+ wxPropertyValue *expr = property->GetValue().GetFirst();
+ while (expr)
+ {
+ char *s = expr->StringValue();
+ if (s)
+ choice->Append(s);
+ expr = expr->GetNext();
+ }
+ if (choice->Number() > 0)
+ choice->SetSelection(0);
+ return TRUE;
+ }
+ else if (name == "sort")
+ {
+ SetWindowStyle(m_propertyWindow, wxCB_SORT, property->GetValue().BoolValue());
+
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
+ resource->SetStyle(m_propertyWindow->GetWindowStyleFlag());
+
+ wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(m_propertyWindow, this);
+ return TRUE;
+ }
+ else if (name == "style")
+ {
+ SetWindowStyle(m_propertyWindow, wxCB_SIMPLE, FALSE);
+ SetWindowStyle(m_propertyWindow, wxCB_DROPDOWN, FALSE);
+ SetWindowStyle(m_propertyWindow, wxCB_READONLY, FALSE);
+
+ wxString styleStr(property->GetValue().StringValue());
+ if (styleStr == "simple")
+ SetWindowStyle(m_propertyWindow, wxCB_SIMPLE, TRUE);
+ else if (styleStr == "dropdown")
+ SetWindowStyle(m_propertyWindow, wxCB_DROPDOWN, TRUE);
+ else if (styleStr == "readonly")
+ SetWindowStyle(m_propertyWindow, wxCB_READONLY, TRUE);
+
+ // Necesary?
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
+ resource->SetStyle(m_propertyWindow->GetWindowStyleFlag());
+
+ wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(m_propertyWindow, this);
+
+ return TRUE;
+ }
+ else
+ return wxItemPropertyInfo::SetProperty(name, property);
+}
+
+void wxComboBoxPropertyInfo::GetPropertyNames(wxStringList& names)
+{
+ wxItemPropertyInfo::GetPropertyNames(names);
+ names.Add("values");
+ names.Add("style");
+ names.Add("sort");
+}
+
+bool wxComboBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
+{
+ wxComboBox *choice = (wxComboBox *)m_propertyWindow;
+ int i;
+ if (choice->Number() == 0)
+ resource->SetStringValues(NULL);
+ else
+ {
+ wxStringList slist;
+
+ for (i = 0; i < choice->Number(); i++)
+ slist.Add(choice->GetString(i));
resource->SetStringValues(slist);
}
wxProperty *wxRadioBoxPropertyInfo::GetProperty(wxString& name)
{
- wxRadioBox *radioBox = (wxRadioBox *)propertyWindow;
+ wxRadioBox *radioBox = (wxRadioBox *)m_propertyWindow;
if (name == "numberRowsOrCols")
{
return new wxProperty("numberRowsOrCols", (long)radioBox->GetNumberOfRowsOrCols(), "integer");
}
if (name == "orientation")
{
- char *pos = NULL;
- if (propertyWindow->GetWindowStyleFlag() & wxHORIZONTAL)
- pos = "wxHORIZONTAL";
+ wxString orient;
+ if (m_propertyWindow->GetWindowStyleFlag() & wxRA_HORIZONTAL)
+ orient = "wxRA_HORIZONTAL";
else
- pos = "wxVERTICAL";
+ orient = "wxRA_VERTICAL";
- return new wxProperty("orientation", pos, "string",
- new wxStringListValidator(new wxStringList("wxHORIZONTAL", "wxVERTICAL",
+ return new wxProperty("orientation", orient, "string",
+ new wxStringListValidator(new wxStringList("wxRA_HORIZONTAL", "wxRA_VERTICAL",
NULL)));
}
else if (name == "values")
bool wxRadioBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxRadioBox *radioBox = (wxRadioBox *)propertyWindow;
+ wxRadioBox *radioBox = (wxRadioBox *)m_propertyWindow;
if (name == "numberRowsOrCols")
{
radioBox->SetNumberOfRowsOrCols((int)property->GetValue().IntegerValue());
{
long windowStyle = radioBox->GetWindowStyleFlag();
wxString val(property->GetValue().StringValue());
- if (val == "wxHORIZONTAL")
+ if (val == "wxRA_HORIZONTAL")
{
- if (windowStyle & wxVERTICAL)
- windowStyle -= wxVERTICAL;
- windowStyle |= wxHORIZONTAL;
+ if (windowStyle & wxRA_VERTICAL)
+ windowStyle -= wxRA_VERTICAL;
+ windowStyle |= wxRA_HORIZONTAL;
}
else
{
- if (windowStyle & wxHORIZONTAL)
- windowStyle -= wxHORIZONTAL;
- windowStyle |= wxVERTICAL;
+ if (windowStyle & wxRA_HORIZONTAL)
+ windowStyle -= wxRA_HORIZONTAL;
+ windowStyle |= wxRA_VERTICAL;
}
radioBox->SetWindowStyleFlag(windowStyle);
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(radioBox);
+ resource->SetStyle(windowStyle);
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
return TRUE;
// Set property into *resource*, not wxRadioBox, and then recreate
// the wxRadioBox. This is because we can't dynamically set the strings
// of a wxRadioBox.
- wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(propertyWindow);
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
if (!resource)
return FALSE;
- wxStringList *stringList = resource->GetStringValues();
- if (!stringList)
- {
- stringList = new wxStringList;
- resource->SetStringValues(stringList);
- }
- stringList->Clear();
-
+ wxStringList stringList;
wxPropertyValue *expr = property->GetValue().GetFirst();
while (expr)
{
char *s = expr->StringValue();
if (s)
- stringList->Add(s);
+ stringList.Add(s);
expr = expr->GetNext();
}
+ resource->SetStringValues(stringList);
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
return TRUE;
}
void wxRadioBoxPropertyInfo::GetPropertyNames(wxStringList& names)
{
+ wxItemPropertyInfo::GetPropertyNames(names);
names.Add("label");
names.Add("values");
names.Add("orientation");
names.Add("numberRowsOrCols");
- wxItemPropertyInfo::GetPropertyNames(names);
}
bool wxRadioBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxRadioBox *rbox = (wxRadioBox *)propertyWindow;
+ wxRadioBox *rbox = (wxRadioBox *)m_propertyWindow;
// Take strings from resource instead
/*
int i;
wxProperty *wxGroupBoxPropertyInfo::GetProperty(wxString& name)
{
- wxStaticBox *groupBox = (wxStaticBox *)propertyWindow;
return wxItemPropertyInfo::GetProperty(name);
}
void wxGroupBoxPropertyInfo::GetPropertyNames(wxStringList& names)
{
- names.Add("label");
wxItemPropertyInfo::GetPropertyNames(names);
+ names.Add("label");
}
bool wxGroupBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxStaticBox *gbox = (wxStaticBox *)propertyWindow;
return wxItemPropertyInfo::InstantiateResource(resource);
}
wxProperty *wxCheckBoxPropertyInfo::GetProperty(wxString& name)
{
- wxCheckBox *checkBox = (wxCheckBox *)propertyWindow;
+ wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;
if (name == "value")
return new wxProperty("value", checkBox->GetValue(), "bool");
else
bool wxCheckBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxCheckBox *checkBox = (wxCheckBox *)propertyWindow;
+ wxCheckBox *checkBox = (wxCheckBox *)m_propertyWindow;
if (name == "value")
{
checkBox->SetValue((bool)property->GetValue().BoolValue());
void wxCheckBoxPropertyInfo::GetPropertyNames(wxStringList& names)
{
+ wxItemPropertyInfo::GetPropertyNames(names);
names.Add("label");
names.Add("value");
- wxItemPropertyInfo::GetPropertyNames(names);
}
bool wxCheckBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxCheckBox *cbox = (wxCheckBox *)propertyWindow;
+ wxCheckBox *cbox = (wxCheckBox *)m_propertyWindow;
resource->SetValue1(cbox->GetValue());
return wxItemPropertyInfo::InstantiateResource(resource);
}
wxProperty *wxRadioButtonPropertyInfo::GetProperty(wxString& name)
{
- wxRadioButton *checkBox = (wxRadioButton *)propertyWindow;
+ wxRadioButton *checkBox = (wxRadioButton *)m_propertyWindow;
if (name == "value")
return new wxProperty("value", checkBox->GetValue(), "bool");
else
bool wxRadioButtonPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxRadioButton *checkBox = (wxRadioButton *)propertyWindow;
+ wxRadioButton *checkBox = (wxRadioButton *)m_propertyWindow;
if (name == "value")
{
checkBox->SetValue((bool)property->GetValue().BoolValue());
void wxRadioButtonPropertyInfo::GetPropertyNames(wxStringList& names)
{
+ wxItemPropertyInfo::GetPropertyNames(names);
names.Add("label");
names.Add("value");
- wxItemPropertyInfo::GetPropertyNames(names);
}
bool wxRadioButtonPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxRadioButton *cbox = (wxRadioButton *)propertyWindow;
+ wxRadioButton *cbox = (wxRadioButton *)m_propertyWindow;
resource->SetValue1(cbox->GetValue());
return wxItemPropertyInfo::InstantiateResource(resource);
}
wxProperty *wxSliderPropertyInfo::GetProperty(wxString& name)
{
- wxSlider *slider = (wxSlider *)propertyWindow;
+ wxSlider *slider = (wxSlider *)m_propertyWindow;
if (name == "value")
return new wxProperty("value", (long)slider->GetValue(), "integer");
else if (name == "orientation")
{
char *pos = NULL;
- if (propertyWindow->GetWindowStyleFlag() & wxHORIZONTAL)
+ if (m_propertyWindow->GetWindowStyleFlag() & wxHORIZONTAL)
pos = "wxHORIZONTAL";
else
pos = "wxVERTICAL";
new wxStringListValidator(new wxStringList("wxHORIZONTAL", "wxVERTICAL",
NULL)));
}
- else if (name == "min_value")
- return new wxProperty("min_value", (long)slider->GetMin(), "integer");
- else if (name == "max_value")
- return new wxProperty("max_value", (long)slider->GetMax(), "integer");
+ else if (name == "minValue")
+ return new wxProperty("minValue", (long)slider->GetMin(), "integer");
+ else if (name == "maxValue")
+ return new wxProperty("maxValue", (long)slider->GetMax(), "integer");
else
return wxItemPropertyInfo::GetProperty(name);
}
bool wxSliderPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxSlider *slider = (wxSlider *)propertyWindow;
+ wxSlider *slider = (wxSlider *)m_propertyWindow;
if (name == "value")
{
slider->SetValue((int)property->GetValue().IntegerValue());
return TRUE;
}
- else if (name == "min_value")
+ else if (name == "minValue")
{
slider->SetRange((int)property->GetValue().IntegerValue(), slider->GetMax());
return TRUE;
}
- else if (name == "max_value")
+ else if (name == "maxValue")
{
slider->SetRange(slider->GetMin(), (int)property->GetValue().IntegerValue());
return TRUE;
void wxSliderPropertyInfo::GetPropertyNames(wxStringList& names)
{
+ wxItemPropertyInfo::GetPropertyNames(names);
names.Add("value");
names.Add("orientation");
- names.Add("min_value");
- names.Add("max_value");
- wxItemPropertyInfo::GetPropertyNames(names);
+ names.Add("minValue");
+ names.Add("maxValue");
}
bool wxSliderPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxSlider *slider = (wxSlider *)propertyWindow;
+ wxSlider *slider = (wxSlider *)m_propertyWindow;
resource->SetValue1(slider->GetValue());
resource->SetValue2(slider->GetMin());
resource->SetValue3(slider->GetMax());
wxProperty *wxGaugePropertyInfo::GetProperty(wxString& name)
{
- wxGauge *gauge = (wxGauge *)propertyWindow;
+ wxGauge *gauge = (wxGauge *)m_propertyWindow;
if (name == "value")
return new wxProperty("value", (long)gauge->GetValue(), "integer");
- else if (name == "max_value")
- return new wxProperty("max_value", (long)gauge->GetRange(), "integer");
+ else if (name == "maxValue")
+ return new wxProperty("maxValue", (long)gauge->GetRange(), "integer");
else
return wxItemPropertyInfo::GetProperty(name);
}
bool wxGaugePropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxGauge *gauge = (wxGauge *)propertyWindow;
+ wxGauge *gauge = (wxGauge *)m_propertyWindow;
if (name == "value")
{
gauge->SetValue((int)property->GetValue().IntegerValue());
return TRUE;
}
- else if (name == "max_value")
+ else if (name == "maxValue")
{
gauge->SetRange((int)property->GetValue().IntegerValue());
return TRUE;
void wxGaugePropertyInfo::GetPropertyNames(wxStringList& names)
{
- names.Add("value");
- names.Add("max_value");
wxItemPropertyInfo::GetPropertyNames(names);
+ names.Add("value");
+ names.Add("maxValue");
}
bool wxGaugePropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxGauge *gauge = (wxGauge *)propertyWindow;
+ wxGauge *gauge = (wxGauge *)m_propertyWindow;
resource->SetValue1(gauge->GetValue());
resource->SetValue2(gauge->GetRange());
return wxItemPropertyInfo::InstantiateResource(resource);
wxProperty *wxScrollBarPropertyInfo::GetProperty(wxString& name)
{
- wxScrollBar *scrollBar = (wxScrollBar *)propertyWindow;
+ wxScrollBar *scrollBar = (wxScrollBar *)m_propertyWindow;
if (name == "value")
return new wxProperty("value", (long)scrollBar->GetValue(), "integer");
else if (name == "orientation")
{
char *pos = NULL;
- if (propertyWindow->GetWindowStyleFlag() & wxHORIZONTAL)
+ if (m_propertyWindow->GetWindowStyleFlag() & wxHORIZONTAL)
pos = "wxHORIZONTAL";
else
pos = "wxVERTICAL";
bool wxScrollBarPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxScrollBar *scrollBar = (wxScrollBar *)propertyWindow;
+ wxScrollBar *scrollBar = (wxScrollBar *)m_propertyWindow;
if (name == "value")
{
scrollBar->SetValue((int)property->GetValue().IntegerValue());
void wxScrollBarPropertyInfo::GetPropertyNames(wxStringList& names)
{
+ wxItemPropertyInfo::GetPropertyNames(names);
names.Add("orientation");
names.Add("value");
names.Add("pageSize");
names.Add("viewLength");
names.Add("objectLength");
- wxItemPropertyInfo::GetPropertyNames(names);
// Remove some properties we don't inherit
names.Delete("fontPoints");
bool wxScrollBarPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxScrollBar *sbar = (wxScrollBar *)propertyWindow;
-
+ wxScrollBar *sbar = (wxScrollBar *)m_propertyWindow;
+
resource->SetValue1(sbar->GetValue());
int viewStart, pageLength, objectLength, viewLength;
wxProperty *wxPanelPropertyInfo::GetProperty(wxString& name)
{
- wxPanel *panelWindow = (wxPanel *)propertyWindow;
+ wxPanel *panelWindow = (wxPanel *)m_propertyWindow;
wxFont *labelFont = panelWindow->GetLabelFont();
wxFont *buttonFont = panelWindow->GetButtonFont();
else
return new wxProperty(name, "Could not get title", "string");
}
+ else if (name == "caption")
+ {
+ return new wxProperty(name, ((panelWindow->GetWindowStyleFlag() & wxCAPTION) == wxCAPTION),
+ "bool");
+ }
+ else if (name == "systemMenu")
+ {
+ return new wxProperty(name, ((panelWindow->GetWindowStyleFlag() & wxSYSTEM_MENU) == wxSYSTEM_MENU),
+ "bool");
+ }
+ else if (name == "thickFrame")
+ {
+ return new wxProperty(name, ((panelWindow->GetWindowStyleFlag() & wxTHICK_FRAME) == wxTHICK_FRAME),
+ "bool");
+ }
+ else if (name == "useSystemDefaults")
+ {
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+ return new wxProperty(name, ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) == wxRESOURCE_USE_DEFAULTS),
+ "bool");
+ }
+ else if (name == "useDialogUnits")
+ {
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+ return new wxProperty(name, ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == wxRESOURCE_DIALOG_UNITS),
+ "bool");
+ }
else
return wxWindowPropertyInfo::GetProperty(name);
}
bool wxPanelPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxPanel *panelWindow = (wxPanel *)propertyWindow;
+ wxPanel *panelWindow = (wxPanel *)m_propertyWindow;
wxFont *labelFont = panelWindow->GetLabelFont();
wxFont *buttonFont = panelWindow->GetButtonFont();
else if (name == "no3D")
{
bool userColours = property->GetValue().BoolValue();
- long flag = panelWindow->GetWindowStyleFlag();
if (userColours)
{
else
return FALSE;
}
+ else if (name == "caption")
+ {
+ SetWindowStyle(panelWindow, wxCAPTION, property->GetValue().BoolValue());
+
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+ resource->SetStyle(panelWindow->GetWindowStyleFlag());
+ return TRUE;
+ }
+ else if (name == "thickFrame")
+ {
+ SetWindowStyle(panelWindow, wxTHICK_FRAME, property->GetValue().BoolValue());
+
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+ resource->SetStyle(panelWindow->GetWindowStyleFlag());
+ return TRUE;
+ }
+ else if (name == "systemMenu")
+ {
+ SetWindowStyle(panelWindow, wxSYSTEM_MENU, property->GetValue().BoolValue());
+
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+ resource->SetStyle(panelWindow->GetWindowStyleFlag());
+ return TRUE;
+ }
+ else if (name == "useSystemDefaults")
+ {
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+ bool useDefaults = property->GetValue().BoolValue();
+ long style = resource->GetResourceStyle();
+ if (useDefaults)
+ {
+ if ((style & wxRESOURCE_USE_DEFAULTS) == 0)
+ style |= wxRESOURCE_USE_DEFAULTS;
+ }
+ else
+ {
+ if ((style & wxRESOURCE_USE_DEFAULTS) != 0)
+ style -= wxRESOURCE_USE_DEFAULTS;
+ }
+ resource->SetResourceStyle(style);
+ panelWindow = (wxPanel *)wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(panelWindow, this);
+ return TRUE;
+ }
+ else if (name == "useDialogUnits")
+ {
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+ bool useDialogUnits = property->GetValue().BoolValue();
+ long style = resource->GetResourceStyle();
+ if (useDialogUnits)
+ {
+ if ((style & wxRESOURCE_DIALOG_UNITS) == 0)
+ {
+ style |= wxRESOURCE_DIALOG_UNITS;
+ ConvertDialogUnits(TRUE); // Convert all resources
+ }
+ }
+ else
+ {
+ if ((style & wxRESOURCE_DIALOG_UNITS) != 0)
+ {
+ style -= wxRESOURCE_DIALOG_UNITS;
+ ConvertDialogUnits(FALSE); // Convert all resources
+ }
+ }
+ resource->SetResourceStyle(style);
+ panelWindow = (wxPanel *)wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(panelWindow, this);
+ // TODO: need to regenerate the width and height properties else they'll be inconsistent.
+ return TRUE;
+ }
else
return wxWindowPropertyInfo::SetProperty(name, property);
}
names.Add("title");
names.Add("no3D");
names.Add("backgroundColour");
+ names.Add("caption");
+ names.Add("systemMenu");
+ names.Add("thickFrame");
+ names.Add("useSystemDefaults");
+ names.Add("useDialogUnits");
}
bool wxPanelPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxPanel *panel = (wxPanel *)propertyWindow;
- if (panel->GetFont())
+ wxPanel *panel = (wxPanel *)m_propertyWindow;
+ if (panel->GetFont() && panel->GetFont()->Ok())
resource->SetFont(wxTheFontList->FindOrCreateFont(panel->GetFont()->GetPointSize(),
panel->GetFont()->GetFamily(), panel->GetFont()->GetStyle(), panel->GetFont()->GetWeight(),
panel->GetFont()->GetUnderlined(), panel->GetFont()->GetFaceName()));
- resource->SetBackgroundColour(new wxColour(panel->GetBackgroundColour()));
+ resource->SetBackgroundColour(wxColour(panel->GetBackgroundColour()));
return wxWindowPropertyInfo::InstantiateResource(resource);
}
+// Convert this dialog, and its children, to or from dialog units
+void wxPanelPropertyInfo::ConvertDialogUnits(bool toDialogUnits)
+{
+ wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
+
+ wxPoint pt;
+ wxSize sz;
+ if (toDialogUnits)
+ {
+ sz = m_propertyWindow->ConvertPixelsToDialog(wxSize(resource->GetWidth(), resource->GetHeight()));
+ pt = m_propertyWindow->ConvertPixelsToDialog(wxPoint(resource->GetX(), resource->GetY()));
+ }
+ else
+ {
+ sz = m_propertyWindow->ConvertDialogToPixels(wxSize(resource->GetWidth(), resource->GetHeight()));
+ pt = m_propertyWindow->ConvertDialogToPixels(wxPoint(resource->GetX(), resource->GetY()));
+ }
+ resource->SetSize(pt.x, pt.y, sz.x, sz.y);
+
+ wxNode* node = m_propertyWindow->GetChildren()->First();
+ while (node)
+ {
+ wxWindow* child = (wxWindow*) node->Data();
+ if (child->IsKindOf(CLASSINFO(wxControl)))
+ {
+ resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(child);
+ if (toDialogUnits)
+ {
+ sz = m_propertyWindow->ConvertPixelsToDialog(wxSize(resource->GetWidth(), resource->GetHeight()));
+ pt = m_propertyWindow->ConvertPixelsToDialog(wxPoint(resource->GetX(), resource->GetY()));
+ }
+ else
+ {
+ sz = m_propertyWindow->ConvertDialogToPixels(wxSize(resource->GetWidth(), resource->GetHeight()));
+ pt = m_propertyWindow->ConvertDialogToPixels(wxPoint(resource->GetX(), resource->GetY()));
+ }
+ resource->SetSize(pt.x, pt.y, sz.x, sz.y);
+ }
+ node = node->Next();
+ }
+}
+
#if 0
/*
* Dialog boxes
wxProperty *wxDialogPropertyInfo::GetProperty(wxString& name)
{
- wxDialog *dialogWindow = (wxDialog *)propertyWindow;
+ wxDialog *dialogWindow = (wxDialog *)m_propertyWindow;
if (name == "modal")
{
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(dialogWindow);
bool wxDialogPropertyInfo::SetProperty(wxString& name, wxProperty *property)
{
- wxDialog *dialogWindow = (wxDialog *)propertyWindow;
+ wxDialog *dialogWindow = (wxDialog *)m_propertyWindow;
if (name == "modal")
{
void wxDialogPropertyInfo::GetPropertyNames(wxStringList& names)
{
+ wxPanelPropertyInfo::GetPropertyNames(names);
names.Add("title");
names.Add("modal");
-
- wxPanelPropertyInfo::GetPropertyNames(names);
}
bool wxDialogPropertyInfo::InstantiateResource(wxItemResource *resource)
{
- wxDialog *dialog = (wxDialog *)propertyWindow;
+ wxDialog *dialog = (wxDialog *)m_propertyWindow;
wxString str(dialog->GetTitle());
- resource->SetTitle(WXSTRINGCAST str);
+ resource->SetTitle(str);
return wxPanelPropertyInfo::InstantiateResource(resource);
}
{
}
-bool wxResourceSymbolValidator::OnCheckValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxResourceSymbolValidator::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.
// Does the transferance from the property editing area to the property itself
-bool wxResourceSymbolValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxResourceSymbolValidator::OnRetrieveValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
{
if (!view->GetValueText())
return FALSE;
// Called when TICK is pressed or focus is lost or view wants to update
// the property list.
// Does the transferance from the property editing area to the property itself
-bool wxResourceSymbolValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxResourceSymbolValidator::OnDisplayValue(wxProperty *property, wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
{
if (!view->GetValueText())
return FALSE;
return TRUE;
}
-bool wxResourceSymbolValidator::OnPrepareControls(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow)
+bool wxResourceSymbolValidator::OnPrepareControls(wxProperty *WXUNUSED(property), wxPropertyListView *view, wxWindow *WXUNUSED(parentWindow))
{
if (view->GetConfirmButton())
view->GetConfirmButton()->Enable(TRUE);
view->UpdatePropertyDisplayInList(property);
view->OnPropertyChanged(property);
}
-
-#if 0
- char *s = wxFileSelector(
- filenameMessage.GetData(),
- wxPathOnly(property->GetValue().StringValue()),
- wxFileNameFromPath(property->GetValue().StringValue()),
- NULL,
- filenameWildCard.GetData(),
- 0,
- parentWindow);
- if (s)
- {
- property->GetValue() = wxString(s);
- view->DisplayProperty(property);
- view->UpdatePropertyDisplayInList(property);
- view->OnPropertyChanged(property);
- }
-#endif
}
BEGIN_EVENT_TABLE(wxResourceSymbolDialog, wxDialog)
x += 80;
m_nameCtrl = new wxComboBox(this, ID_SYMBOLNAME_COMBOBOX, "",
- wxPoint(x, y), wxSize(200, -1), 0, NULL, wxCB_DROPDOWN);
+ wxPoint(x, y), wxSize(200, -1), 0, NULL, wxCB_DROPDOWN|wxCB_SORT);
y += 30;
x = 5;
return TRUE;
}
-void wxResourceSymbolDialog::OnComboBoxSelect(wxCommandEvent& event)
+void wxResourceSymbolDialog::OnComboBoxSelect(wxCommandEvent& WXUNUSED(event))
{
- wxString str(m_nameCtrl->GetValue());
+ wxString str(m_nameCtrl->GetStringSelection());
if (wxResourceManager::GetCurrentResourceManager()->GetSymbolTable().IsStandardSymbol(str))
{
int id = wxResourceManager::GetCurrentResourceManager()->GetSymbolTable().GetIdForSymbol(str);
}
}
-void wxResourceSymbolDialog::OnSymbolNameUpdate(wxCommandEvent& event)
+void wxResourceSymbolDialog::OnSymbolNameUpdate(wxCommandEvent& WXUNUSED(event))
{
wxString str(m_nameCtrl->GetValue());
if (wxResourceManager::GetCurrentResourceManager()->GetSymbolTable().IsStandardSymbol(str))
projects / wxWidgets.git / blobdiff