Menu
▾
▴
[simspark-cvs] simspark/contrib/rsgedit mainframe.cpp, 1.17, 1.18 rsgedit.wxg, 1.6, 1.7
|
From: Markus R. <rol...@us...> - 2007-06-15 09:02:55
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20391 Modified Files: mainframe.cpp rsgedit.wxg Log Message: - tweak window border styles Index: rsgedit.wxg =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/rsgedit.wxg,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** rsgedit.wxg 17 May 2007 17:49:23 -0000 1.6 --- rsgedit.wxg 15 Jun 2007 09:02:51 -0000 1.7 *************** *** 1,4 **** <?xml version="1.0"?> ! <!-- generated by wxGlade 0.4.1 on Tue May 01 10:32:21 2007 --> <application path="." name="" class="" option="1" language="C++" top_window="MainFrame" encoding="UTF-8" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.6"> --- 1,4 ---- <?xml version="1.0"?> ! <!-- generated by wxGlade 0.4.1 on Fri Jun 15 11:01:22 2007 --> <application path="." name="" class="" option="1" language="C++" top_window="MainFrame" encoding="UTF-8" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.6"> *************** *** 75,84 **** <option>1</option> <object class="wxSplitterWindow" name="mCtrVertSplitter" base="EditSplitterWindow"> ! <style>wxSP_3D|wxSP_BORDER</style> <orientation>wxSPLIT_VERTICAL</orientation> <window_2>mRightPane</window_2> <window_1>mLeftPane</window_1> <object class="wxPanel" name="mLeftPane" base="EditPanel"> ! <style>wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer"> <orient>wxVERTICAL</orient> --- 75,84 ---- <option>1</option> <object class="wxSplitterWindow" name="mCtrVertSplitter" base="EditSplitterWindow"> ! <style>wxSP_NOBORDER</style> <orientation>wxSPLIT_VERTICAL</orientation> <window_2>mRightPane</window_2> <window_1>mLeftPane</window_1> <object class="wxPanel" name="mLeftPane" base="EditPanel"> ! <style>wxSIMPLE_BORDER|wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer"> <orient>wxVERTICAL</orient> *************** *** 88,97 **** <option>1</option> <object class="wxSplitterWindow" name="window_1" base="EditSplitterWindow"> ! <style>wxSP_3D|wxSP_BORDER</style> <orientation>wxSPLIT_HORIZONTAL</orientation> <window_2>window_1_pane_2</window_2> <window_1>window_1_pane_1</window_1> <object class="wxPanel" name="window_1_pane_1" base="EditPanel"> ! <style>wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer"> <orient>wxVERTICAL</orient> --- 88,97 ---- <option>1</option> <object class="wxSplitterWindow" name="window_1" base="EditSplitterWindow"> ! <style>wxSP_3DBORDER|wxSP_BORDER</style> <orientation>wxSPLIT_HORIZONTAL</orientation> <window_2>window_1_pane_2</window_2> <window_1>window_1_pane_1</window_1> <object class="wxPanel" name="window_1_pane_1" base="EditPanel"> ! <style>wxNO_BORDER|wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_4" base="EditBoxSizer"> <orient>wxVERTICAL</orient> *************** *** 101,105 **** <option>1</option> <object class="wxListCtrl" name="mCtrPropList" base="EditListCtrl"> ! <style>wxLC_REPORT|wxSUNKEN_BORDER</style> </object> </object> --- 101,105 ---- <option>1</option> <object class="wxListCtrl" name="mCtrPropList" base="EditListCtrl"> ! <style>wxLC_REPORT|wxSIMPLE_BORDER</style> </object> </object> *************** *** 107,111 **** </object> <object class="wxPanel" name="window_1_pane_2" base="EditPanel"> ! <style>wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_8" base="EditBoxSizer"> <orient>wxVERTICAL</orient> --- 107,111 ---- </object> <object class="wxPanel" name="window_1_pane_2" base="EditPanel"> ! <style>wxNO_BORDER|wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_8" base="EditBoxSizer"> <orient>wxVERTICAL</orient> *************** *** 115,119 **** <option>1</option> <object class="wxTreeCtrl" name="mCtrTree" base="EditTreeCtrl"> ! <style>wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_LINES_AT_ROOT|wxTR_DEFAULT_STYLE|wxSUNKEN_BORDER</style> <id>1</id> </object> --- 115,119 ---- <option>1</option> <object class="wxTreeCtrl" name="mCtrTree" base="EditTreeCtrl"> ! <style>wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_LINES_AT_ROOT|wxTR_DEFAULT_STYLE|wxSIMPLE_BORDER</style> <id>1</id> </object> *************** *** 126,130 **** </object> <object class="wxPanel" name="mRightPane" base="EditPanel"> ! <style>wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer"> <orient>wxVERTICAL</orient> --- 126,130 ---- </object> <object class="wxPanel" name="mRightPane" base="EditPanel"> ! <style>wxSIMPLE_BORDER|wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_2" base="EditBoxSizer"> <orient>wxVERTICAL</orient> *************** *** 134,143 **** <option>1</option> <object class="wxSplitterWindow" name="mCtrHorSplitter" base="EditSplitterWindow"> ! <style>wxSP_3D|wxSP_BORDER</style> <orientation>wxSPLIT_HORIZONTAL</orientation> <window_2>mBottomPane</window_2> <window_1>mTopPane</window_1> <object class="wxPanel" name="mTopPane" base="EditPanel"> ! <style>wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer"> <orient>wxVERTICAL</orient> --- 134,143 ---- <option>1</option> <object class="wxSplitterWindow" name="mCtrHorSplitter" base="EditSplitterWindow"> ! <style>wxSP_NOBORDER</style> <orientation>wxSPLIT_HORIZONTAL</orientation> <window_2>mBottomPane</window_2> <window_1>mTopPane</window_1> <object class="wxPanel" name="mTopPane" base="EditPanel"> ! <style>wxNO_BORDER|wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_5" base="EditBoxSizer"> <orient>wxVERTICAL</orient> *************** *** 156,160 **** </object> <object class="wxPanel" name="mBottomPane" base="EditPanel"> ! <style>wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer"> <orient>wxVERTICAL</orient> --- 156,160 ---- </object> <object class="wxPanel" name="mBottomPane" base="EditPanel"> ! <style>wxNO_BORDER|wxTAB_TRAVERSAL</style> <object class="wxBoxSizer" name="sizer_6" base="EditBoxSizer"> <orient>wxVERTICAL</orient> *************** *** 164,168 **** <option>1</option> <object class="wxTextCtrl" name="mCtrLog" base="EditTextCtrl"> ! <style>wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL</style> </object> </object> --- 164,168 ---- <option>1</option> <object class="wxTextCtrl" name="mCtrLog" base="EditTextCtrl"> ! <style>wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL|wxNO_BORDER</style> </object> </object> Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mainframe.cpp 17 May 2007 17:49:23 -0000 1.17 --- mainframe.cpp 15 Jun 2007 09:02:50 -0000 1.18 *************** *** 108,120 **** // begin wxGlade: mainframe::mainframe ! mCtrVertSplitter = new wxSplitterWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_BORDER); ! mRightPane = new wxPanel(mCtrVertSplitter, -1); ! mCtrHorSplitter = new wxSplitterWindow(mRightPane, -1, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_BORDER); ! mBottomPane = new wxPanel(mCtrHorSplitter, -1); ! mTopPane = new wxPanel(mCtrHorSplitter, -1); ! mLeftPane = new wxPanel(mCtrVertSplitter, -1); ! window_1 = new wxSplitterWindow(mLeftPane, -1, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_BORDER); ! window_1_pane_2 = new wxPanel(window_1, -1); ! window_1_pane_1 = new wxPanel(window_1, -1); MainFrame_menubar = new wxMenuBar(); SetMenuBar(MainFrame_menubar); --- 108,120 ---- // begin wxGlade: mainframe::mainframe ! mCtrVertSplitter = new wxSplitterWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER); ! mRightPane = new wxPanel(mCtrVertSplitter, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL); ! mCtrHorSplitter = new wxSplitterWindow(mRightPane, -1, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER); ! mBottomPane = new wxPanel(mCtrHorSplitter, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL); ! mTopPane = new wxPanel(mCtrHorSplitter, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL); ! mLeftPane = new wxPanel(mCtrVertSplitter, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL); ! window_1 = new wxSplitterWindow(mLeftPane, -1, wxDefaultPosition, wxDefaultSize, wxSP_3DBORDER|wxSP_BORDER); ! window_1_pane_2 = new wxPanel(window_1, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL); ! window_1_pane_1 = new wxPanel(window_1, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL); MainFrame_menubar = new wxMenuBar(); SetMenuBar(MainFrame_menubar); *************** *** 137,144 **** MainFrame_menubar->Append(wxglade_tmp_menu_4, wxT("&Help")); MainFrame_statusbar = CreateStatusBar(1, 0); ! mCtrPropList = new wxListCtrl(window_1_pane_1, -1, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER); ! mCtrTree = new wxTreeCtrl(window_1_pane_2, 1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_LINES_AT_ROOT|wxTR_DEFAULT_STYLE|wxSUNKEN_BORDER); mCanvas = new SparkGLCanvas(mTopPane, -1); ! mCtrLog = new wxTextCtrl(mBottomPane, -1, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL); set_properties(); --- 137,144 ---- MainFrame_menubar->Append(wxglade_tmp_menu_4, wxT("&Help")); MainFrame_statusbar = CreateStatusBar(1, 0); ! mCtrPropList = new wxListCtrl(window_1_pane_1, -1, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSIMPLE_BORDER); ! mCtrTree = new wxTreeCtrl(window_1_pane_2, 1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_LINES_AT_ROOT|wxTR_DEFAULT_STYLE|wxSIMPLE_BORDER); mCanvas = new SparkGLCanvas(mTopPane, -1); ! mCtrLog = new wxTextCtrl(mBottomPane, -1, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL|wxNO_BORDER); set_properties(); |
