Fixed various wxMSW compile problems that came down the telephone line...
plus wxTreeCtrl::EditLabel/EndEditLabel, dialog editor stuff, wxMSW header changes, doc changes. Sorry about the quantity :-( git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,14 +20,14 @@
|
||||
|
||||
class wxPropertyInfo;
|
||||
|
||||
class wxDialogEditorPropertyListDialog: public wxPropertyListDialog
|
||||
class wxDialogEditorPropertyListFrame: public wxPropertyListFrame
|
||||
{
|
||||
friend class wxPropertyInfo;
|
||||
public:
|
||||
wxDialogEditorPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
|
||||
wxDialogEditorPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
|
||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox");
|
||||
~wxDialogEditorPropertyListDialog();
|
||||
long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
|
||||
~wxDialogEditorPropertyListFrame();
|
||||
|
||||
private:
|
||||
wxPropertySheet* m_propSheet;
|
||||
@@ -57,7 +57,7 @@ class wxResourcePropertyListView: public wxPropertyListView
|
||||
// them with separate classes.
|
||||
class wxPropertyInfo: public wxObject
|
||||
{
|
||||
friend class wxDialogEditorPropertyListDialog;
|
||||
friend class wxDialogEditorPropertyListFrame;
|
||||
protected:
|
||||
static wxWindow *sm_propertyWindow;
|
||||
wxPropertyInfo(void)
|
||||
@@ -97,6 +97,9 @@ class wxWindowPropertyInfo: public wxPropertyInfo
|
||||
|
||||
// Fill in the wxItemResource members to mirror the current window settings
|
||||
virtual bool InstantiateResource(wxItemResource *resource);
|
||||
|
||||
// Set the window style
|
||||
void SetWindowStyle(wxWindow* win, long style, bool set);
|
||||
};
|
||||
|
||||
// For panel items
|
||||
|
||||
Reference in New Issue
Block a user