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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/utils/wxrcedit/Makefile.in
View File

@@ -25,7 +25,7 @@ DATAFILES = df/break.df df/control.df df/menu_item.df df/notebookpage.df \
df/wxStaticLine.df df/wxStaticText.df df/wxTextCtrl.df \
df/wxToolBar.df df/wxTreeCtrl.df
APPEXTRALIBS=$(top_builddir)/lib/libwxxrc.@WX_TARGET_LIBRARY_TYPE@
APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
include $(top_builddir)/src/makeprog.env

6
contrib/utils/wxrcedit/editor.cpp
View File

@@ -494,8 +494,7 @@ void EditorFrame::OnTreeSel(wxTreeEvent& event)
}
RecursivelyExpand(m_TreeCtrl, event.GetItem());
PreviewFrame::Get()->Preview(node,m_Resource->GetRoot()->GetPropVal(
wxT("version"), wxT("0.0.0.0")));
PreviewFrame::Get()->Preview(node,m_Resource);
}
}
@@ -509,8 +508,7 @@ void EditorFrame::OnToolbar(wxCommandEvent& event)
{
XmlTreeData* dt = (XmlTreeData*)m_TreeCtrl->GetItemData(m_TreeCtrl->GetSelection());;
if (dt != NULL && dt->Node != NULL)
PreviewFrame::Get()->Preview(dt->Node,m_Resource->GetRoot()->GetPropVal(
wxT("version"), wxT("0.0.0.0")));
PreviewFrame::Get()->Preview(dt->Node, m_Resource);
break;
}

9
contrib/utils/wxrcedit/preview.cpp
View File

@@ -140,8 +140,10 @@ void PreviewFrame::MakeDirty()
void PreviewFrame::Preview(wxXmlNode *node,const wxString &version)
void PreviewFrame::Preview(wxXmlNode *node, wxXmlDocument *orig_doc)
{
wxString version = orig_doc->GetRoot()->GetPropVal(wxT("version"), wxT("0.0.0.0"));
while (node->GetParent()->GetParent() != NULL) node = node->GetParent();
{
@@ -150,6 +152,7 @@ void PreviewFrame::Preview(wxXmlNode *node,const wxString &version)
root->AddProperty(new wxXmlProperty(wxT("version"),version,NULL));
doc.SetRoot(root);
doc.GetRoot()->AddChild(new wxXmlNode(*node));
doc.SetFileEncoding(orig_doc->GetFileEncoding());
if (XmlGetClass(doc.GetRoot()->GetChildren()) == _T("wxDialog"))
XmlSetClass(doc.GetRoot()->GetChildren(), _T("wxPanel"));
@@ -168,7 +171,7 @@ void PreviewFrame::Preview(wxXmlNode *node,const wxString &version)
}
m_Node = node;
m_Version = version;
m_Doc = orig_doc;
m_LogCtrl->Clear();
wxLogTextCtrl mylog(m_LogCtrl);
@@ -237,5 +240,5 @@ END_EVENT_TABLE()
void PreviewFrame::OnMouseEnter(wxMouseEvent& event)
{
if (m_Dirty) Preview(m_Node,m_Version);
if (m_Dirty) Preview(m_Node,m_Doc);
}

4
contrib/utils/wxrcedit/preview.h
View File

@@ -31,7 +31,7 @@ class PreviewFrame : public wxFrame
PreviewFrame();
~PreviewFrame();
void Preview(wxXmlNode *node,const wxString &version);
void Preview(wxXmlNode *node,wxXmlDocument *doc);
void MakeDirty();
// current node updated, needs preview refresh
// (will be done once mouse enters preview win)
@@ -47,7 +47,7 @@ class PreviewFrame : public wxFrame
private:
static PreviewFrame *ms_Instance;
wxXmlNode *m_Node;
wxString m_Version;
wxXmlDocument *m_Doc;
wxScrolledWindow *m_ScrollWin;
wxTextCtrl *m_LogCtrl;
wxSplitterWindow *m_Splitter;

4
contrib/utils/wxrcedit/wxRcEditVC.dsp
View File

@@ -110,7 +110,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrcedit.exe" /pdbtype:sept /libpath:"..\..\..\lib"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrcedit.exe" /pdbtype:sept /libpath:"..\..\..\lib"
!ELSEIF "$(CFG)" == "wxRcEditVC - Win32 Release DLL"
@@ -137,7 +137,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw233.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrcedit.exe" /libpath:"..\..\..\lib"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw234.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrcedit.exe" /libpath:"..\..\..\lib"
!ENDIF