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

Removed DrawOpenSpline since it doesn't seem to be needed, with required changes

Browse Source 
in all ports. Added Motif wxFileDialog. Added wxPostScriptModule and removed
PostScript init in app.cpp. Also removed wxMessageBox function from
generic implementation. Windows release .exes are now smaller (< 300K for minimal.exe).
Some OGL updates. __try -> try in MSW main.cpp. BC++ 5 fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-10-02 12:50:01 +00:00
parent 9c039d08bf
commit dfad059924
56 changed files with 825 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -687,8 +687,7 @@ wxFrame *wxResourceManager::OnCreateEditorFrame(const char *title)
frame->SetAutoLayout(TRUE);
#ifdef __WXMSW__
wxIcon *icon = new wxIcon("DIALOGEDICON");
frame->SetIcon(icon);
frame->SetIcon(wxIcon("DIALOGEDICON"));
#endif
return frame;
}
@@ -893,7 +892,7 @@ void wxResourceManager::AddItemsRecursively(long parent, wxItemResource *resourc
node = node->Next();
}
}
m_editorResourceTree->ExpandItem(id, wxTREE_EXPAND_EXPAND);
// m_editorResourceTree->ExpandItem(id, wxTREE_EXPAND_EXPAND);
}
bool wxResourceManager::EditSelectedResource()
@@ -921,8 +920,8 @@ bool wxResourceManager::Edit(wxItemResource *res)
}
else
{
long style = res->GetStyle();
res->SetStyle(style|wxRAISED_BORDER);
// long style = res->GetStyle();
// res->SetStyle(style|wxRAISED_BORDER);
panel = new wxPanel;
wxResourceEditorDialogHandler *handler = new wxResourceEditorDialogHandler(panel, res, panel->GetEventHandler(),
this);
@@ -931,7 +930,7 @@ bool wxResourceManager::Edit(wxItemResource *res)
panel->PushEventHandler(handler);
res->SetStyle(style);
// res->SetStyle(style);
handler->AddChildHandlers(); // Add event handlers for all controls
AssociateResource(res, panel);

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

@@ -230,6 +230,10 @@ int wxResourceSymbolTable::FindHighestId()
node = m_hashTable.Next();
}
// Make sure we don't clash with future standard wxWindows ids
if (highest <= wxID_HIGHEST)
highest = wxID_HIGHEST + 1;
return highest;
}
@@ -245,12 +249,49 @@ struct wxStandardSymbolStruct
static wxStandardSymbolStruct sg_StandardSymbols[] =
{
{ "wxID_OK", wxID_OK },
{ "wxID_CANCEL", wxID_CANCEL },
{ "wxID_APPLY", wxID_APPLY },
// { "wxID_STATIC", wxID_STATIC },
{ "wxID_YES", wxID_YES },
{ "wxID_NO", wxID_NO }
{ "wxID_OK", wxID_OK },
{ "wxID_CANCEL", wxID_CANCEL },
{ "wxID_APPLY", wxID_APPLY },
{ "wxID_HELP", wxID_HELP },
{ "wxID_STATIC", wxID_STATIC },
{ "wxID_YES", wxID_YES },
{ "wxID_NO", wxID_NO },
{ "wxID_OPEN", wxID_OPEN },
{ "wxID_CLOSE", wxID_CLOSE },
{ "wxID_NEW", wxID_NEW },
{ "wxID_SAVE", wxID_SAVE },
{ "wxID_SAVEAS", wxID_SAVEAS },
{ "wxID_REVERT", wxID_REVERT },
{ "wxID_EXIT", wxID_EXIT },
{ "wxID_UNDO", wxID_UNDO },
{ "wxID_REDO", wxID_REDO },
{ "wxID_PRINT", wxID_PRINT },
{ "wxID_PRINT_SETUP", wxID_PRINT_SETUP },
{ "wxID_PREVIEW", wxID_PREVIEW },
{ "wxID_ABOUT", wxID_ABOUT },
{ "wxID_HELP_CONTENTS", wxID_HELP_CONTENTS },
{ "wxID_HELP_COMMANDS", wxID_HELP_COMMANDS },
{ "wxID_HELP_PROCEDURES", wxID_HELP_PROCEDURES },
{ "wxID_HELP_CONTEXT", wxID_HELP_CONTEXT },
{ "wxID_CUT", wxID_CUT },
{ "wxID_COPY", wxID_COPY },
{ "wxID_PASTE", wxID_PASTE },
{ "wxID_CLEAR", wxID_CLEAR },
{ "wxID_FIND", wxID_FIND },
{ "wxID_DUPLICATE", wxID_DUPLICATE },
{ "wxID_FILE1", wxID_FILE1 },
{ "wxID_FILE2", wxID_FILE2 },
{ "wxID_FILE3", wxID_FILE3 },
{ "wxID_FILE4", wxID_FILE4 },
{ "wxID_FILE5", wxID_FILE5 },
{ "wxID_FILE6", wxID_FILE6 },
{ "wxID_FILE7", wxID_FILE7 },
{ "wxID_FILE8", wxID_FILE8 },
{ "wxID_FILE9", wxID_FILE9 }
};
static int sg_StandardSymbolSize = (sizeof(sg_StandardSymbols)/sizeof(wxStandardSymbolStruct));

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

@@ -325,6 +325,26 @@ wxProperty *wxWindowPropertyInfo::GetProperty(wxString& name)
else
return NULL;
}
else if (name == "border")
{
wxString border("");
if (propertyWindow->GetWindowStyleFlag() & wxSIMPLE_BORDER)
border = "wxSIMPLE_BORDER";
else if (propertyWindow->GetWindowStyleFlag() & wxRAISED_BORDER)
border = "wxRAISED_BORDER";
else if (propertyWindow->GetWindowStyleFlag() & wxSUNKEN_BORDER)
border = "wxSUNKEN_BORDER";
else if (propertyWindow->GetWindowStyleFlag() & wxDOUBLE_BORDER)
border = "wxDOUBLE_BORDER";
else if (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;
}
@@ -491,6 +511,37 @@ bool wxWindowPropertyInfo::SetProperty(wxString& name, wxProperty *property)
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(propertyWindow, wxSIMPLE_BORDER, FALSE);
SetWindowStyle(propertyWindow, wxRAISED_BORDER, FALSE);
SetWindowStyle(propertyWindow, wxSUNKEN_BORDER, FALSE);
SetWindowStyle(propertyWindow, wxDOUBLE_BORDER, FALSE);
SetWindowStyle(propertyWindow, wxSTATIC_BORDER, FALSE);
SetWindowStyle(propertyWindow, wxNO_BORDER, FALSE);
SetWindowStyle(propertyWindow, borderStyle, TRUE);
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(propertyWindow);
resource->SetStyle(propertyWindow->GetWindowStyleFlag());
return TRUE;
}
else
return FALSE;
}
@@ -503,6 +554,7 @@ void wxWindowPropertyInfo::GetPropertyNames(wxStringList& names)
names.Add("y");
names.Add("width");
names.Add("height");
names.Add("border");
if (!propertyWindow->IsKindOf(CLASSINFO(wxControl)))
{
names.Add("fontPoints");