AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MSW fixes; ^M removal

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2000-11-27 13:55:03 +00:00
parent 97b305b71c
commit aaa2b34e81
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/utils/wxrcedit/pe_adv.cpp
View File

@ -165,6 +165,7 @@ void PropEditCtrlFlags::OnDetails()
dlg.SetSizer(sz);
dlg.SetAutoLayout(TRUE);
dlg.Layout();
for (i = 0; i < arr.GetCount(); i++)
lbox->Append(arr[i]);

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

@ -61,7 +61,9 @@ PreviewFrame *PreviewFrame::Get()
}
PreviewFrame::PreviewFrame()
: wxFrame(NULL, -1, _("Preview"))
: wxFrame(EditorFrame::Get(), -1, _("Preview"),
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR | wxFRAME_TOOL_WINDOW)
{
m_Dirty = FALSE;
ms_Instance = this;
@ -89,6 +91,8 @@ PreviewFrame::PreviewFrame()
m_Splitter->SplitHorizontally(m_ScrollWin, m_LogCtrl, cfg->Read(_T("previewframe_sash"), 300));
CreateStatusBar();
SetSize(GetSize()); // refresh: MSW needs it
}

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

@ -20,7 +20,7 @@
#include "propframe.h"
class WXDLLEXPORT wxXmlNode;
class WXDLLEXPORT wxTreeCtrl;
class WXDLLEXPORT wxGenericTreeCtrl;
class WXDLLEXPORT wxTextCtrl;
@ -61,7 +61,7 @@ class PropEditCtrl : public wxPanel
PropertiesFrame *m_PropFrame;
bool m_Created;
wxTreeCtrl *m_TreeCtrl;
wxGenericTreeCtrl *m_TreeCtrl;
wxTreeItemId m_TreeItem;
wxWindow *m_TheCtrl;
PropertyInfo *m_PropInfo;

21
contrib/utils/wxrcedit/propframe.cpp
View File

@ -27,6 +27,7 @@
#include "propedit.h"
#include "pe_basic.h"
#include "pe_adv.h"
#include "editor.h"
// ------------- support classes --------
@ -104,6 +105,19 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
m_EditCtrl = NULL;
}
}
void OnScroll(wxScrollWinEvent& event)
{
event.Skip();
if (event.GetOrientation() == wxHORIZONTAL) return;
if (!m_EditCtrl) return;
wxTreeItemId id = GetSelection();
wxRect bounding;
GetBoundingRect(id, bounding);
m_EditCtrl->Move(-1, bounding.y);
}
PropEditCtrl *m_EditCtrl;
@ -113,6 +127,7 @@ class PropsTree: public wxRemotelyScrolledTreeCtrl
BEGIN_EVENT_TABLE(PropsTree, wxRemotelyScrolledTreeCtrl)
EVT_PAINT(PropsTree::OnPaint)
EVT_TREE_SEL_CHANGED(-1, PropsTree::OnSelChange)
EVT_SCROLLWIN(PropsTree::OnScroll)
END_EVENT_TABLE()
@ -157,7 +172,7 @@ class PropsValueWindow: public wxTreeCompanionWindow
GetTreeCtrl()->SelectItem(item);
}
}
DECLARE_EVENT_TABLE()
};
@ -184,7 +199,9 @@ PropertiesFrame *PropertiesFrame::Get()
}
PropertiesFrame::PropertiesFrame()
: wxFrame(NULL, -1, _("Properties"))
: wxFrame(EditorFrame::Get(), -1, _("Properties"),
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR | wxFRAME_TOOL_WINDOW)
{
ms_Instance = this;
m_Node = NULL;