Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed various wxMSW compile problems that came down the telephone line...

Browse Source 
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:
Julian Smart
1998-08-07 23:52:45 +00:00
parent c2d8daeb4a
commit bbcdf8bc7c
110 changed files with 1009 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/dialoged/src/makefile.b32
View File

@@ -38,7 +38,7 @@ DEBUG_FLAGS =
!endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtable.obj winstyle.obj
$(TARGET).exe: wxprop $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
tlink32 $(LINKFLAGS) @&&!

8
utils/dialoged/src/makefile.g95
View File

@@ -16,7 +16,7 @@ include $(WXDIR)/src/makeg95.env
OBJECTS = $(OBJDIR)/dialoged.$(OBJSUFF) $(OBJDIR)/reseditr.$(OBJSUFF)\
$(OBJDIR)/dlghndlr.$(OBJSUFF) $(OBJDIR)/reswrite.$(OBJSUFF) $(OBJDIR)/winprop.$(OBJSUFF)\
$(OBJDIR)/edlist.$(OBJSUFF) $(OBJDIR)/edtree.$(OBJSUFF)\
$(OBJDIR)/edlist.$(OBJSUFF) $(OBJDIR)/edtree.$(OBJSUFF) $(OBJDIR)/winstyle.$(OBJSUFF) $(OBJDIR)/symbtabl.$(OBJSUFF)\
$(OBJDIR)/dialoged_resources.$(OBJSUFF)
EXTRAINC = -I../../wxprop/src
@@ -58,6 +58,12 @@ $(OBJDIR)/edlist.$(OBJSUFF): winprop.h edlist.h edlist.$(SRCSUFF)
$(OBJDIR)/edtree.$(OBJSUFF): winprop.h edtree.h edtree.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
$(OBJDIR)/winstyle.$(OBJSUFF): winstyle.h winstyle.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
$(OBJDIR)/symbtabl.$(OBJSUFF): symbtabl.h symbtabl.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
$(OBJDIR)/dialoged_resources.o: dialoged.rc
$(RESCOMP) -i dialoged.rc -o $(OBJDIR)/dialoged_resources.o $(RESFLAGS)

7
utils/dialoged/src/makefile.nt
View File

@@ -26,7 +26,7 @@ LOCALDOCDIR=$(WXDIR)\utils\dialoged\docs
PROGRAM=dialoged
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\
winprop.obj edtree.obj edlist.obj symbtabl.obj
winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
all: wxprop dialoged.exe
@@ -88,6 +88,11 @@ symbtabl.obj: symbtabl.h symbtabl.$(SRCSUFF) $(DUMMYOBJ)
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<<
winstyle.obj: winstyle.h winstyle.$(SRCSUFF) $(DUMMYOBJ)
$(cc) @<<
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<<
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc

117
utils/dialoged/src/reseditr.cpp
View File

@@ -141,7 +141,7 @@ bool wxResourceManager::Initialize()
m_optionsResourceFilename = buf;
#elif defined(__X__)
char buf[500];
()wxGetHomeDir(buf);
wxGetHomeDir(buf);
strcat(buf, "/.dialogedrc");
m_optionsResourceFilename = buf;
#else
@@ -329,6 +329,7 @@ bool wxResourceManager::Save(const wxString& filename)
InstantiateAllResourcesFromWindows();
if (m_resourceTable.Save(filename))
{
m_symbolTable.WriteIncludeFile(m_symbolFilename);
Modify(FALSE);
return TRUE;
}
@@ -345,6 +346,15 @@ bool wxResourceManager::SaveAs()
return FALSE;
m_currentFilename = s;
wxStripExtension(m_currentFilename);
m_currentFilename += ".wxr";
// Construct include filename from this file
m_symbolFilename = m_currentFilename;
wxStripExtension(m_symbolFilename);
m_symbolFilename += ".h";
Save(m_currentFilename);
return TRUE;
}
@@ -401,6 +411,8 @@ bool wxResourceManager::New(bool loadFromFile, const wxString& filename)
{
wxString str("Could not find include file ");
str += m_symbolFilename;
str += ".\nDialog Editor maintains a header file containing id symbols to be used in the application.\n";
str += "The next time this .wxr file is saved, a header file will be saved also.";
wxMessageBox(str, "Dialog Editor Warning", MB_OK);
m_symbolIdCounter = 99;
@@ -410,6 +422,19 @@ bool wxResourceManager::New(bool loadFromFile, const wxString& filename)
// Set the id counter to the last known id
m_symbolIdCounter = m_symbolTable.FindHighestId();
}
// Now check in case some (or all) resources don't have resource ids, or they
// don't match the .h file, or something of that nature.
bool altered = RepairResourceIds();
if (altered)
{
wxMessageBox("Some resources have had new identifiers associated with them, since they were missing.", "Dialog Editor Warning", MB_OK);
Modify(TRUE);
}
else
Modify(FALSE);
return TRUE;
}
else
{
@@ -885,11 +910,10 @@ bool wxResourceManager::CreateNewPanel()
ClearCurrentDialog();
char buf[256];
MakeUniqueName("panel", buf);
MakeUniqueName("dialog", buf);
wxItemResource *resource = new wxItemResource;
// resource->SetType(wxTYPE_PANEL);
resource->SetType("wxPanel");
resource->SetType("wxDialog");
resource->SetName(buf);
resource->SetTitle(buf);
@@ -904,10 +928,10 @@ bool wxResourceManager::CreateNewPanel()
wxPanel *panel = new wxPanel(m_editorPanel, -1,
wxPoint(m_editorPanel->GetMarginX(), m_editorPanel->GetMarginY()),
wxSize(400, 300), wxRAISED_BORDER, buf);
wxSize(400, 300), wxRAISED_BORDER|wxDEFAULT_DIALOG_STYLE, buf);
m_editorPanel->m_childWindow = panel;
resource->SetStyle(0); // panel->GetWindowStyleFlag());
resource->SetStyle(panel->GetWindowStyleFlag());
resource->SetSize(10, 10, 400, 300);
// For editing in situ we will need to use the hash table to ensure
@@ -992,7 +1016,7 @@ bool wxResourceManager::CreatePanelItem(wxItemResource *panelResource, wxPanel *
}
else if (itemType == "wxListBox")
{
prefix = "ID_LISTBIX";
prefix = "ID_LISTBOX";
MakeUniqueName("listbox", buf);
res->SetName(buf);
newItem = new wxListBox(panel, -1, wxPoint(x, y), wxSize(-1, -1), 0, NULL, 0, wxDefaultValidator, buf);
@@ -1114,14 +1138,14 @@ bool wxResourceManager::TestCurrentDialog(wxWindow* parent)
wxDialog* dialog = new wxDialog;
long oldStyle = item->GetStyle();
bool success = FALSE;
item->SetStyle(wxDEFAULT_DIALOG_STYLE);
// item->SetStyle(wxDEFAULT_DIALOG_STYLE);
if (dialog->LoadFromResource(parent, item->GetName(), & m_resourceTable))
{
dialog->Centre();
dialog->ShowModal();
success = TRUE;
}
item->SetStyle(oldStyle);
// item->SetStyle(oldStyle);
return success;
}
return FALSE;
@@ -1521,12 +1545,13 @@ bool wxResourceManager::IsSymbolUsed(wxItemResource* thisResource, wxWindowID id
while (node = m_resourceTable.Next())
{
wxItemResource *res = (wxItemResource *)node->Data();
if ((res != thisResource) && (res->GetId() == id))
return TRUE;
wxString resType(res->GetType());
if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
{
if ((res != thisResource) && (res->GetId() == id))
return TRUE;
wxNode *node1 = res->GetChildren().First();
while (node1)
{
@@ -1563,12 +1588,13 @@ void wxResourceManager::ChangeIds(int oldId, int newId)
while (node = m_resourceTable.Next())
{
wxItemResource *res = (wxItemResource *)node->Data();
if (res->GetId() == oldId)
res->SetId(newId);
wxString resType(res->GetType());
if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
{
if (res->GetId() == oldId)
res->SetId(newId);
wxNode *node1 = res->GetChildren().First();
while (node1)
{
@@ -1582,6 +1608,71 @@ void wxResourceManager::ChangeIds(int oldId, int newId)
}
}
// If any resource ids were missing (or their symbol was missing),
// repair them i.e. give them new ids. Returns TRUE if any resource
// needed repairing.
bool wxResourceManager::RepairResourceIds()
{
bool repaired = FALSE;
m_resourceTable.BeginFind();
wxNode *node;
while (node = m_resourceTable.Next())
{
wxItemResource *res = (wxItemResource *)node->Data();
wxString resType(res->GetType());
if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
{
if ( (res->GetId() == 0) || ((res->GetId() > 0) && !m_symbolTable.IdExists(res->GetId())) )
{
wxString newSymbolName;
int newId = GenerateWindowId("ID_DIALOG", newSymbolName) ;
if (res->GetId() == 0)
{
res->SetId(newId);
m_symbolTable.AddSymbol(newSymbolName, newId);
}
else
{
m_symbolTable.AddSymbol(newSymbolName, res->GetId());
}
repaired = TRUE;
}
wxNode *node1 = res->GetChildren().First();
while (node1)
{
wxItemResource *child = (wxItemResource *)node1->Data();
if ( (child->GetId() == 0) || ((child->GetId() > 0) && !m_symbolTable.IdExists(child->GetId())) )
{
wxString newSymbolName;
int newId = GenerateWindowId("ID_CONTROL", newSymbolName) ;
if (child->GetId() == 0)
{
child->SetId(newId);
m_symbolTable.AddSymbol(newSymbolName, newId);
}
else
{
m_symbolTable.AddSymbol(newSymbolName, child->GetId());
}
repaired = TRUE;
}
node1 = node1->Next();
}
}
}
return repaired;
}
// Deletes 'win' and creates a new window from the resource that
// was associated with it. E.g. if you can't change properties on the
// fly, you'll need to delete the window and create it again.

22
utils/dialoged/src/reseditr.h
View File

@@ -27,6 +27,7 @@
#include "proplist.h"
#include "symbtabl.h"
#include "winstyle.h"
#define RESED_DELETE 1
#define RESED_RECREATE 3
@@ -112,14 +113,16 @@ class wxResourceTableWithSaving: public wxResourceTable
public:
wxResourceTableWithSaving():wxResourceTable()
{
// Add all known window styles
m_styleTable.Init();
}
virtual bool Save(const wxString& filename);
virtual bool SaveResource(ostream& stream, wxItemResource *item);
void GenerateWindowStyleString(long windowStyle, char *buf);
void GeneratePanelStyleString(long windowStyle, char *buf);
void GenerateDialogStyleString(long windowStyle, char *buf);
/*
void GenerateRadioBoxStyleString(long windowStyle, char *buf);
void GenerateMessageStyleString(long windowStyle, char *buf);
void GenerateTextStyleString(long windowStyle, char *buf);
@@ -131,13 +134,21 @@ class wxResourceTableWithSaving: public wxResourceTable
void GenerateGroupBoxStyleString(long windowStyle, char *buf);
void GenerateGaugeStyleString(long windowStyle, char *buf);
void GenerateChoiceStyleString(long windowStyle, char *buf);
void GenerateComboBoxStyleString(long windowStyle, char *buf);
void GenerateScrollBarStyleString(long windowStyle, char *buf);
void GenerateItemStyleString(long windowStyle, char *buf);
*/
void GenerateControlStyleString(const wxString& windowClass, long windowStyle, char *buf);
/*
bool GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle);
*/
void OutputFont(ostream& stream, wxFont *font);
wxControl *CreateItem(wxPanel *panel, wxItemResource *childResource);
protected:
wxWindowStyleTable m_styleTable;
};
class wxResourceEditorScrolledWindow;
@@ -232,6 +243,11 @@ public:
// must be changed.
void ChangeIds(int oldId, int newId);
// If any resource ids were missing (or their symbol was missing),
// repair them i.e. give them new ids. Returns TRUE if any resource
// needed repairing.
bool RepairResourceIds();
// Deletes 'win' and creates a new window from the resource that
// was associated with it. E.g. if you can't change properties on the
// fly, you'll need to delete the window and create it again.

252
utils/dialoged/src/reswrite.cpp
View File

@@ -108,14 +108,14 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
else
{
stream << "static char *" << item->GetName() << " = \"panel(name = '" << item->GetName() << "',\\\n";
GeneratePanelStyleString(item->GetStyle(), styleBuf);
GenerateDialogStyleString(item->GetStyle(), styleBuf);
}
stream << " style = '" << styleBuf << "',\\\n";
stream << " title = '" << item->GetTitle() << "',\\\n";
stream << " id = " << item->GetId() << ",\\\n";
stream << " x = " << item->GetX() << ", y = " << item->GetY();
stream << ", width = " << item->GetWidth() << ", height = " << item->GetHeight();
// stream << " modal = " << item->GetValue1();
if (1) // item->GetStyle() & wxNO_3D)
{
if (item->GetBackgroundColour())
@@ -128,29 +128,6 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
stream << ",\\\n " << "background_colour = '" << buf << "'";
}
#if 0
if (item->GetLabelColour())
{
char buf[7];
wxDecToHex(item->GetLabelColour()->Red(), buf);
wxDecToHex(item->GetLabelColour()->Green(), buf+2);
wxDecToHex(item->GetLabelColour()->Blue(), buf+4);
buf[6] = 0;
stream << ",\\\n " << "label_colour = '" << buf << "'";
}
if (item->GetButtonColour())
{
char buf[7];
wxDecToHex(item->GetButtonColour()->Red(), buf);
wxDecToHex(item->GetButtonColour()->Green(), buf+2);
wxDecToHex(item->GetButtonColour()->Blue(), buf+4);
buf[6] = 0;
stream << ",\\\n " << "button_colour = '" << buf << "'";
}
#endif
}
if (item->GetFont() && item->GetFont()->Ok())
@@ -182,8 +159,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxButton" || itemType == "wxBitmapButton")
{
GenerateButtonStyleString(item->GetStyle(), styleBuf);
stream << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
if (item->GetValue4())
@@ -196,8 +173,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxStaticText" || itemType == "wxStaticBitmap")
{
GenerateMessageStyleString(item->GetStyle(), styleBuf);
stream << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
if (item->GetValue4())
@@ -210,8 +187,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxCheckBox")
{
GenerateCheckBoxStyleString(item->GetStyle(), styleBuf);
stream << "wxCheckBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << "wxCheckBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
stream << ", " << item->GetValue1();
@@ -223,8 +200,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxRadioButton")
{
GenerateRadioButtonStyleString(item->GetStyle(), styleBuf);
stream << "wxRadioButton, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << "wxRadioButton, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
stream << ", " << item->GetValue1();
@@ -236,8 +213,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxStaticBox")
{
GenerateGroupBoxStyleString(item->GetStyle(), styleBuf);
stream << "wxGroupBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << "wxGroupBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
if (item->GetFont())
@@ -248,8 +225,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxText" || itemType == "wxMultiText" || itemType == "wxTextCtrl")
{
GenerateTextStyleString(item->GetStyle(), styleBuf);
stream << "wxTextCtrl, ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << "wxTextCtrl, ";
stream << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
@@ -262,8 +239,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxGauge")
{
GenerateGaugeStyleString(item->GetStyle(), styleBuf);
stream << "wxGauge, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << "wxGauge, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
stream << ", " << item->GetValue1() << ", " << item->GetValue2();
@@ -275,8 +252,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxSlider")
{
GenerateSliderStyleString(item->GetStyle(), styleBuf);
stream << "wxSlider, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << "wxSlider, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3();
@@ -288,8 +265,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxScrollBar")
{
GenerateScrollBarStyleString(item->GetStyle(), styleBuf);
stream << "wxScrollBar, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << "wxScrollBar, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3() << ", ";
@@ -297,8 +274,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
}
else if (itemType == "wxListBox")
{
GenerateListBoxStyleString(item->GetStyle(), styleBuf);
stream << "wxListBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << "wxListBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
@@ -343,13 +320,17 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
OutputFont(stream, item->GetFont());
}
}
else if (itemType == "wxChoice")
else if (itemType == "wxChoice" || itemType == "wxComboBox")
{
GenerateChoiceStyleString(item->GetStyle(), styleBuf);
stream << "wxChoice, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
if (itemType == "wxComboBox")
stream << SafeWord(item->GetValue4()) << ", ";
// Default list of values
stream << ", [";
@@ -375,8 +356,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
else if (itemType == "wxRadioBox")
{
// Must write out the orientation and number of rows/cols!!
GenerateRadioBoxStyleString(item->GetStyle(), styleBuf);
stream << "wxRadioBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
stream << item->GetId() << ", " << "wxRadioBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
stream << item->GetWidth() << ", " << item->GetHeight();
@@ -531,31 +512,13 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
return TRUE;
}
void wxResourceTableWithSaving::GenerateWindowStyleString(long windowStyle, char *buf)
{
GenerateStyle(buf, windowStyle, wxNO_3D, "wxNO_3D");
GenerateStyle(buf, windowStyle, wxVSCROLL, "wxVSCROLL");
GenerateStyle(buf, windowStyle, wxHSCROLL, "wxHSCROLL");
GenerateStyle(buf, windowStyle, wxBORDER, "wxBORDER");
}
void wxResourceTableWithSaving::GenerateDialogStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateWindowStyleString(windowStyle, buf);
m_styleTable.GenerateStyleStrings("wxWindow", windowStyle, buf);
m_styleTable.GenerateStyleStrings("wxPanel", windowStyle, buf);
m_styleTable.GenerateStyleStrings("wxDialog", windowStyle, buf);
/*
GenerateStyle(buf, windowStyle, wxRETAINED, "wxRETAINED");
*/
if (!GenerateStyle(buf, windowStyle, wxDEFAULT_DIALOG_STYLE, "wxDEFAULT_DIALOG_STYLE"))
{
GenerateStyle(buf, windowStyle, wxCAPTION, "wxCAPTION");
GenerateStyle(buf, windowStyle, wxTHICK_FRAME, "wxTHICK_FRAME");
GenerateStyle(buf, windowStyle, wxRESIZE_BORDER, "wxRESIZE_BORDER");
GenerateStyle(buf, windowStyle, wxSYSTEM_MENU, "wxSYSTEM_MENU");
GenerateStyle(buf, windowStyle, wxMINIMIZE_BOX, "wxMINIMIZE_BOX");
GenerateStyle(buf, windowStyle, wxMAXIMIZE_BOX, "wxMAXIMIZE_BOX");
}
if (strlen(buf) == 0)
strcat(buf, "0");
}
@@ -563,158 +526,25 @@ void wxResourceTableWithSaving::GenerateDialogStyleString(long windowStyle, char
void wxResourceTableWithSaving::GeneratePanelStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateWindowStyleString(windowStyle, buf);
m_styleTable.GenerateStyleStrings("wxWindow", windowStyle, buf);
m_styleTable.GenerateStyleStrings("wxPanel", windowStyle, buf);
/*
GenerateStyle(buf, windowStyle, wxRETAINED, "wxRETAINED");
*/
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateItemStyleString(long windowStyle, char *buf)
{
GenerateWindowStyleString(windowStyle, buf);
GenerateStyle(buf, windowStyle, wxHORIZONTAL, "wxHORIZONTAL");
GenerateStyle(buf, windowStyle, wxVERTICAL, "wxVERTICAL");
}
void wxResourceTableWithSaving::GenerateRadioBoxStyleString(long windowStyle, char *buf)
void wxResourceTableWithSaving::GenerateControlStyleString(const wxString& windowClass, long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateMessageStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateTextStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
GenerateStyle(buf, windowStyle, wxTE_PROCESS_ENTER, "wxTE_PROCESS_ENTER");
GenerateStyle(buf, windowStyle, wxTE_READONLY, "wxTE_READONLY");
GenerateStyle(buf, windowStyle, wxTE_PASSWORD, "wxTE_PASSWORD");
GenerateStyle(buf, windowStyle, wxTE_MULTILINE, "wxTE_MULTILINE");
m_styleTable.GenerateStyleStrings("wxWindow", windowStyle, buf);
m_styleTable.GenerateStyleStrings("wxControl", windowStyle, buf);
m_styleTable.GenerateStyleStrings(windowClass, windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateButtonStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateCheckBoxStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateRadioButtonStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateListBoxStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
GenerateStyle(buf, windowStyle, wxLB_ALWAYS_SB, "wxLB_ALWAYS_SB");
GenerateStyle(buf, windowStyle, wxLB_SORT, "wxLB_SORT");
// GenerateStyle(buf, windowStyle, wxLB_SINGLE, "wxLB_SINGLE"); // Done already
GenerateStyle(buf, windowStyle, wxLB_MULTIPLE, "wxLB_MULTIPLE");
GenerateStyle(buf, windowStyle, wxLB_EXTENDED, "wxLB_EXTENDED");
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateSliderStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateGroupBoxStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateGaugeStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
GenerateStyle(buf, windowStyle, wxGA_PROGRESSBAR, "wxGA_PROGRESSBAR");
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateChoiceStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
void wxResourceTableWithSaving::GenerateScrollBarStyleString(long windowStyle, char *buf)
{
buf[0] = 0;
GenerateItemStyleString(windowStyle, buf);
if (strlen(buf) == 0)
strcat(buf, "0");
}
bool wxResourceTableWithSaving::GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle)
{
if ((windowStyle & flag) == flag)
{
if (strlen(buf) > 0)
strcat(buf, " | ");
strcat(buf, strStyle);
return TRUE;
}
else
return FALSE;
}
// Returns quoted string or "NULL"
char *SafeString(char *s)
{

7
utils/dialoged/src/symbtabl.cpp
View File

@@ -121,6 +121,13 @@ bool wxResourceSymbolTable::WriteIncludeFile(const wxString& filename)
if (!file.Open(filename, wxFile::write))
return FALSE;
wxString fileOnly(wxFileNameFromPath(filename));
wxString line;
line.Printf("/*\n * %s\n * Window identifiers file written by Dialog Editor\n */\n\n",
(const char*) fileOnly);
file.Write(line, line.Length());
m_hashTable.BeginFind();
wxNode* node = m_hashTable.Next();

168
utils/dialoged/src/winprop.cpp
View File

@@ -74,6 +74,7 @@ wxWindow *wxPropertyInfo::sm_propertyWindow;
* wxDialogEditorPropertyListDialog
*/
/*
wxDialogEditorPropertyListDialog::wxDialogEditorPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
const wxPoint& pos, const wxSize& size,
long style, const wxString& name):
@@ -89,6 +90,23 @@ wxDialogEditorPropertyListDialog::~wxDialogEditorPropertyListDialog()
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
@@ -127,32 +145,32 @@ bool wxPropertyInfo::Edit(wxWindow *parent, const wxString& title)
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;
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_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_propInfo = this;
propDialog->m_propSheet = propSheet;
propWin->m_propInfo = this;
propWin->m_propSheet = propSheet;
// view->propertyWindow = propDialog;
view->AddRegistry(&(propDialog->m_registry));
view->ShowView(propSheet, propDialog);
// view->propertyWindow = propWin;
view->AddRegistry(&(propWin->m_registry));
propDialog->Show(TRUE);
propWin->Initialize();
view->ShowView(propSheet, propWin->GetPropertyPanel());
propWin->Show(TRUE);
return TRUE;
}
@@ -511,6 +529,27 @@ bool wxWindowPropertyInfo::InstantiateResource(wxItemResource *resource)
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
@@ -594,8 +633,8 @@ bool wxButtonPropertyInfo::SetProperty(wxString& name, wxProperty *property)
void wxButtonPropertyInfo::GetPropertyNames(wxStringList& names)
{
names.Add("label");
wxItemPropertyInfo::GetPropertyNames(names);
names.Add("label");
}
bool wxButtonPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -696,8 +735,8 @@ bool wxStaticTextPropertyInfo::SetProperty(wxString& name, wxProperty *property)
void wxStaticTextPropertyInfo::GetPropertyNames(wxStringList& names)
{
names.Add("label");
wxItemPropertyInfo::GetPropertyNames(names);
names.Add("label");
}
bool wxStaticTextPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -772,8 +811,8 @@ bool wxStaticBitmapPropertyInfo::SetProperty(wxString& name, wxProperty *propert
void wxStaticBitmapPropertyInfo::GetPropertyNames(wxStringList& names)
{
names.Add("label");
wxItemPropertyInfo::GetPropertyNames(names);
names.Add("label");
}
bool wxStaticBitmapPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -856,10 +895,10 @@ bool wxTextPropertyInfo::SetProperty(wxString& name, wxProperty *property)
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)
@@ -955,9 +994,9 @@ bool wxListBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
void wxListBoxPropertyInfo::GetPropertyNames(wxStringList& names)
{
wxItemPropertyInfo::GetPropertyNames(names);
names.Add("values");
names.Add("multiple");
wxItemPropertyInfo::GetPropertyNames(names);
}
bool wxListBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1024,8 +1063,8 @@ bool wxChoicePropertyInfo::SetProperty(wxString& name, wxProperty *property)
void wxChoicePropertyInfo::GetPropertyNames(wxStringList& names)
{
names.Add("values");
wxItemPropertyInfo::GetPropertyNames(names);
names.Add("values");
}
bool wxChoicePropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1144,11 +1183,11 @@ bool wxRadioBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
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)
@@ -1190,8 +1229,8 @@ bool wxGroupBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
void wxGroupBoxPropertyInfo::GetPropertyNames(wxStringList& names)
{
names.Add("label");
wxItemPropertyInfo::GetPropertyNames(names);
names.Add("label");
}
bool wxGroupBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1227,9 +1266,9 @@ bool wxCheckBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
void wxCheckBoxPropertyInfo::GetPropertyNames(wxStringList& names)
{
wxItemPropertyInfo::GetPropertyNames(names);
names.Add("label");
names.Add("value");
wxItemPropertyInfo::GetPropertyNames(names);
}
bool wxCheckBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1266,9 +1305,9 @@ bool wxRadioButtonPropertyInfo::SetProperty(wxString& name, wxProperty *property
void wxRadioButtonPropertyInfo::GetPropertyNames(wxStringList& names)
{
wxItemPropertyInfo::GetPropertyNames(names);
names.Add("label");
names.Add("value");
wxItemPropertyInfo::GetPropertyNames(names);
}
bool wxRadioButtonPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1363,11 +1402,11 @@ bool wxSliderPropertyInfo::SetProperty(wxString& name, wxProperty *property)
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);
}
bool wxSliderPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1413,9 +1452,9 @@ bool wxGaugePropertyInfo::SetProperty(wxString& name, wxProperty *property)
void wxGaugePropertyInfo::GetPropertyNames(wxStringList& names)
{
wxItemPropertyInfo::GetPropertyNames(names);
names.Add("value");
names.Add("max_value");
wxItemPropertyInfo::GetPropertyNames(names);
}
bool wxGaugePropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1533,12 +1572,12 @@ bool wxScrollBarPropertyInfo::SetProperty(wxString& name, wxProperty *property)
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");
@@ -1608,6 +1647,21 @@ wxProperty *wxPanelPropertyInfo::GetProperty(wxString& name)
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
return wxWindowPropertyInfo::GetProperty(name);
}
@@ -1676,6 +1730,30 @@ bool wxPanelPropertyInfo::SetProperty(wxString& name, wxProperty *property)
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
return wxWindowPropertyInfo::SetProperty(name, property);
}
@@ -1687,6 +1765,9 @@ void wxPanelPropertyInfo::GetPropertyNames(wxStringList& names)
names.Add("title");
names.Add("no3D");
names.Add("backgroundColour");
names.Add("caption");
names.Add("systemMenu");
names.Add("thickFrame");
}
bool wxPanelPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1742,10 +1823,9 @@ bool wxDialogPropertyInfo::SetProperty(wxString& name, wxProperty *property)
void wxDialogPropertyInfo::GetPropertyNames(wxStringList& names)
{
wxPanelPropertyInfo::GetPropertyNames(names);
names.Add("title");
names.Add("modal");
wxPanelPropertyInfo::GetPropertyNames(names);
}
bool wxDialogPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1884,24 +1964,6 @@ void wxResourceSymbolValidator::OnEdit(wxProperty *property, wxPropertyListView
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)
@@ -1922,7 +1984,7 @@ wxResourceSymbolDialog::wxResourceSymbolDialog(wxWindow* parent, const wxWindowI
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;
@@ -2041,7 +2103,7 @@ bool wxResourceSymbolDialog::CheckValues()
void wxResourceSymbolDialog::OnComboBoxSelect(wxCommandEvent& event)
{
wxString str(m_nameCtrl->GetValue());
wxString str(m_nameCtrl->GetStringSelection());
if (wxResourceManager::GetCurrentResourceManager()->GetSymbolTable().IsStandardSymbol(str))
{
int id = wxResourceManager::GetCurrentResourceManager()->GetSymbolTable().GetIdForSymbol(str);

13
utils/dialoged/src/winprop.h
View File

@@ -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