Menu
▾
▴
[Wxdevide-svn] SF.net SVN: wxdevide:[16] trunk/wxdevide/source
|
From: <tb...@us...> - 2011-12-04 03:10:48
|
Revision: 16
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=16&view=rev
Author: tbreina
Date: 2011-12-04 03:10:39 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Updated source code for wxDev-C++ 7.4. Project should open correctly and build with wxWidgets 2.8.12 monolithic unicode. Needs unicode build of stc library. Program is still just a skeleton pre-alpha of original Delphi source code for Dev-C++.
Modified Paths:
--------------
trunk/wxdevide/source/AddToDoFrm.cpp
trunk/wxdevide/source/AddToDoFrm.h
trunk/wxdevide/source/AddToDoFrm.wxform
trunk/wxdevide/source/ColorEditDlg.cpp
trunk/wxdevide/source/ColorEditDlg.wxform
trunk/wxdevide/source/CompileProgressForm.cpp
trunk/wxdevide/source/CompileProgressForm.h
trunk/wxdevide/source/CompileProgressForm.wxform
trunk/wxdevide/source/Compiler.cpp
trunk/wxdevide/source/Compiler.h
trunk/wxdevide/source/DevCfg.cpp
trunk/wxdevide/source/DevCpp.dev
trunk/wxdevide/source/DevCpp.layout
trunk/wxdevide/source/DevTheme.cpp
trunk/wxdevide/source/Editor.cpp
trunk/wxdevide/source/EditorOptfrm.cpp
trunk/wxdevide/source/EditorOptfrm.wxform
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/EnviroFrm.h
trunk/wxdevide/source/EnviroFrm.wxform
trunk/wxdevide/source/FilePropertiesfrm.cpp
trunk/wxdevide/source/FilePropertiesfrm.wxform
trunk/wxdevide/source/GotoLineFrm.cpp
trunk/wxdevide/source/GotoLineFrm.wxform
trunk/wxdevide/source/Images/LangFrm_LoadBtn_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnAbout_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnAddToProject_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnClose_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnCompileAndRun_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnCompile_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugPause_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugRestart_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugStepInto_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugStepOver_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugStop_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebug_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnFindNext_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnFind_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnGotoLine_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnGoto_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnHelp_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnInsert_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnNewAll_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnNewFile_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnNewProject_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnOpen_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnPrint_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnProgramReset_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnProjectOptions_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnRebuildAll_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnRedo_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnRemoveFromProject_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnReplace_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnRun_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnSaveAll_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnSaveUnit_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnToggle_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnUndo_XPM.xpm
trunk/wxdevide/source/Images/Self_MainFrm_XPM.xpm
trunk/wxdevide/source/Images/TEditorOptForm_btnSaveSyntax_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnAdd_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnClose_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnDelete_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnDown_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnEdit_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnUp_XPM.xpm
trunk/wxdevide/source/LangFrm.cpp
trunk/wxdevide/source/LangFrm.h
trunk/wxdevide/source/LangFrm.wxform
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/MainFrm.h
trunk/wxdevide/source/MainFrm.wxform
trunk/wxdevide/source/Makefile.win
trunk/wxdevide/source/NewProjectFrm.cpp
trunk/wxdevide/source/NewProjectFrm.wxform
trunk/wxdevide/source/Project.cpp
trunk/wxdevide/source/SearchCenter.h
trunk/wxdevide/source/SplashFrm.cpp
trunk/wxdevide/source/SplashFrm.wxform
trunk/wxdevide/source/ToolEditForm.cpp
trunk/wxdevide/source/ToolEditForm.wxform
trunk/wxdevide/source/ToolFrm.cpp
trunk/wxdevide/source/ToolFrm.wxform
trunk/wxdevide/source/Utils.cpp
trunk/wxdevide/source/Version.h
trunk/wxdevide/source/devcppApp.cpp
trunk/wxdevide/source/oysUtils.cpp
Modified: trunk/wxdevide/source/AddToDoFrm.cpp
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.cpp 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/AddToDoFrm.cpp 2011-12-04 03:10:39 UTC (rev 16)
@@ -29,8 +29,8 @@
////Manual Code End
EVT_CLOSE(AddToDoFrm::OnClose)
- EVT_BUTTON(wxID_CANCEL,AddToDoFrm::BtnCancelClick)
- EVT_BUTTON(wxID_OK,AddToDoFrm::BtnOKClick)
+ EVT_BUTTON(wxID_OK, AddToDoFrm::BtnOKClick)
+ EVT_BUTTON(wxID_CANCEL, AddToDoFrm::BtnCancelClick)
END_EVENT_TABLE()
////Event Table End
@@ -56,51 +56,56 @@
this->SetSizer(DialogSizer);
this->SetAutoLayout(true);
- WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxDefaultPosition, wxDefaultSize);
- WxPanel1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- DialogSizer->Add(WxPanel1,0,wxALIGN_CENTER | wxALL,5);
+ WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxPoint(1, 1), wxSize(301, 285));
+ WxPanel1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ DialogSizer->Add(WxPanel1, 0, wxALIGN_CENTER | wxALL, 5);
PanelSizer = new wxBoxSizer(wxVERTICAL);
WxPanel1->SetSizer(PanelSizer);
WxPanel1->SetAutoLayout(true);
- LblDescription = new wxStaticText(WxPanel1, ID_LBLDESCRIPTION, _("Description:"), wxDefaultPosition, wxDefaultSize, 0, _("LblDescription"));
- LblDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- PanelSizer->Add(LblDescription,0,wxALIGN_LEFT | wxALL,5);
+ LblDescription = new wxStaticText(WxPanel1, ID_LBLDESCRIPTION, wxT("Description:"), wxPoint(118, 5), wxDefaultSize, 0, wxT("LblDescription"));
+ LblDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ PanelSizer->Add(LblDescription, 0, wxALIGN_LEFT | wxALL, 5);
- MemDescription = new wxTextCtrl(WxPanel1, ID_MEMDESCRIPTION, _(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE, wxDefaultValidator, _("MemDescription"));
+ MemDescription = new wxTextCtrl(WxPanel1, ID_MEMDESCRIPTION, wxEmptyString, wxPoint(9, 32), wxSize(277, 95), wxTE_MULTILINE, wxDefaultValidator, wxT("MemDescription"));
MemDescription->SetMaxLength(0);
MemDescription->SetFocus();
MemDescription->SetInsertionPointEnd();
- MemDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- PanelSizer->Add(MemDescription,1,wxEXPAND | wxALL,5);
+ MemDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ PanelSizer->Add(MemDescription, 1, wxEXPAND | wxALL, 5);
WxFlexGridSizer1 = new wxFlexGridSizer(0, 2, 0, 0);
PanelSizer->Add(WxFlexGridSizer1, 0, wxALIGN_CENTER | wxALL, 5);
- LblPriority = new wxStaticText(WxPanel1, ID_LBLPRIORITY, _("Priority:"), wxDefaultPosition, wxDefaultSize, 0, _("LblPriority"));
- LblPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(LblPriority,0,wxALIGN_LEFT | wxALL,5);
+ LblPriority = new wxStaticText(WxPanel1, ID_LBLPRIORITY, wxT("Priority:"), wxPoint(42, 5), wxDefaultSize, 0, wxT("LblPriority"));
+ LblPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblPriority, 0, wxALIGN_LEFT | wxALL, 5);
- LblUser = new wxStaticText(WxPanel1, ID_LBLUSER, _("User:"), wxDefaultPosition, wxDefaultSize, 0, _("LblUser"));
- LblUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(LblUser,1,wxALIGN_LEFT | wxALL,5);
+ LblUser = new wxStaticText(WxPanel1, ID_LBLUSER, wxT("User:"), wxPoint(190, 5), wxDefaultSize, 0, wxT("LblUser"));
+ LblUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblUser, 1, wxALIGN_LEFT | wxALL, 5);
- SpnPriority = new wxSpinCtrl(WxPanel1, ID_SPNPRIORITY, _("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 9, 1);
- SpnPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(SpnPriority,0,wxALIGN_LEFT | wxALL,5);
+ SpnPriority = new wxSpinCtrl(WxPanel1, ID_SPNPRIORITY, wxT("1"), wxPoint(5, 32), wxSize(113, 22), wxSP_ARROW_KEYS, 1, 9, 1);
+ SpnPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(SpnPriority, 0, wxALIGN_LEFT | wxALL, 5);
- EdtUser = new wxTextCtrl(WxPanel1, ID_EDTUSER, _(""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_ALPHANUMERIC, NULL), _("EdtUser"));
- EdtUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(EdtUser,1,0 | wxALL,5);
+ EdtUser = new wxTextCtrl(WxPanel1, ID_EDTUSER, wxT(""), wxPoint(128, 32), wxSize(153, 22), 0, wxTextValidator(wxFILTER_ALPHANUMERIC, NULL), wxT("EdtUser"));
+ EdtUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(EdtUser, 1, 0 | wxALL, 5);
- WxStdDialogButtonSizer1 = CreateButtonSizer(wxOK | wxCANCEL);
+ WxStdDialogButtonSizer1 = new wxStdDialogButtonSizer;
+ btnOK = new wxButton( this, wxID_OK );
+ WxStdDialogButtonSizer1->AddButton( btnOK );
+ btnCANCEL = new wxButton( this, wxID_CANCEL );
+ WxStdDialogButtonSizer1->AddButton( btnCANCEL );
+ WxStdDialogButtonSizer1->Realize();
DialogSizer->Add(WxStdDialogButtonSizer1, 0, wxALIGN_CENTER | wxALL, 5);
- SetTitle(_("Add To-Do Item"));
+ SetTitle(wxT("Add To-Do Item"));
SetIcon(wxNullIcon);
- GetSizer()->Layout();
+ Layout();
GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this);
Center();
Modified: trunk/wxdevide/source/AddToDoFrm.h
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.h 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/AddToDoFrm.h 2011-12-04 03:10:39 UTC (rev 16)
@@ -53,7 +53,9 @@
//GUI Control Declaration Start and GUI Control Declaration End.
//wxDev-C++ will remove them. Add custom code after the block.
////GUI Control Declaration Start
- wxSizer *WxStdDialogButtonSizer1;
+ wxStdDialogButtonSizer *WxStdDialogButtonSizer1;
+ wxButton *btnOK;
+ wxButton *btnCANCEL;
wxTextCtrl *EdtUser;
wxSpinCtrl *SpnPriority;
wxStaticText *LblUser;
Modified: trunk/wxdevide/source/AddToDoFrm.wxform
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.wxform 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/AddToDoFrm.wxform 2011-12-04 03:10:39 UTC (rev 16)
@@ -15,6 +15,7 @@
OldCreateOrder = True
PopupMenu = DesignerPopup.Owner
Visible = True
+ OnClick = FormClick
OnCreate = FormCreate
OnDestroy = FormDestroy
OnResize = FormResize
@@ -31,6 +32,7 @@
Wx_DialogStyle = [wxCAPTION, wxSYSTEM_MENU, wxDIALOG_NO_PARENT, wxMINIMIZE_BOX, wxCLOSE_BOX, wxFRAME_TOOL_WINDOW]
Wx_Border = 0
Wx_BorderAlignment = []
+ isAuimanagerAvailable = False
PixelsPerInch = 96
TextHeight = 13
object DialogSizer: TWxBoxSizer
@@ -51,19 +53,35 @@
Top = 1
Width = 301
Height = 285
- Align = alClient
- TabOrder = 0
- Wx_BKColor = clBlack
- Wx_Class = 'wxPanel'
+ Align = alClient
+ TabOrder = 0
+ Wx_BKColor = clBlack
+ Wx_Class = 'wxPanel'
Wx_ControlOrientation = wxControlVertical
- Wx_Default = False
- Wx_EventList.Strings = (
- 'EVT_UPDATE_UI:OnUpdateUI')
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_WXPANEL1'
- Wx_IDValue = 1002
+ Wx_Default = False
+ Wx_EventList.Strings = (
+ 'EVT_UPDATE_UI:OnUpdateUI')
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_WXPANEL1'
+ Wx_IDValue = 1002
+ Wx_PaneCaption = 'WxPanel1'
+ Wx_PaneName = 'WxPanel1_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
object PanelSizer: TWxBoxSizer
Left = 1
Top = 1
@@ -78,44 +96,76 @@
Wx_IDValue = 1006
Wx_Alignment = [wxEXPAND]
Wx_StretchFactor = 1
- object LblDescription: TWxStaticText
+ object LblDescription: TWxStaticText
Left = 118
Top = 5
- Width = 60
- Height = 17
- Caption = 'Description:'
- TabOrder = 0
- Wx_BGColor = clBlack
- Wx_Class = 'wxStaticText'
+ Width = 60
+ Height = 17
+ Caption = 'Description:'
+ TabOrder = 0
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxStaticText'
Wx_ControlOrientation = wxControlVertical
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_LBLDESCRIPTION'
- Wx_IDValue = 1003
- Wx_LabelStyle = []
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_LBLDESCRIPTION'
+ Wx_IDValue = 1003
+ Wx_LabelStyle = []
Wx_Alignment = [wxALIGN_LEFT]
- end
- object MemDescription: TWxMemo
+ Wx_PaneCaption = 'LblDescription'
+ Wx_PaneName = 'LblDescription_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ object MemDescription: TWxMemo
Left = 9
Top = 32
- Width = 277
- Height = 95
- BevelInner = bvNone
- BevelOuter = bvNone
- TabOrder = 1
- Wx_BGColor = clBlack
- Wx_Class = 'wxTextCtrl'
+ Width = 277
+ Height = 95
+ BevelInner = bvNone
+ BevelOuter = bvNone
+ TabOrder = 1
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxTextCtrl'
Wx_ControlOrientation = wxControlVertical
- Wx_EditStyle = [wxTE_MULTILINE]
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_IDName = 'ID_MEMDESCRIPTION'
- Wx_IDValue = 1004
- Wx_MaxLength = 0
+ Wx_EditStyle = [wxTE_MULTILINE]
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_IDName = 'ID_MEMDESCRIPTION'
+ Wx_IDValue = 1004
+ Wx_MaxLength = 0
Wx_Alignment = [wxEXPAND]
Wx_StretchFactor = 1
- end
+ Wx_PaneCaption = 'MemDescription'
+ Wx_PaneName = 'MemDescription_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
object WxFlexGridSizer1: TWxFlexGridSizer
Left = 5
Top = 137
@@ -126,89 +176,152 @@
Wx_ControlOrientation = wxControlVertical
Wx_IDName = 'ID_WXFLEXGRIDSIZER1'
Wx_IDValue = 1013
- object LblPriority: TWxStaticText
+ object LblPriority: TWxStaticText
Left = 42
Top = 5
- Width = 38
- Height = 17
- Caption = 'Priority:'
+ Width = 38
+ Height = 17
+ Caption = 'Priority:'
TabOrder = 0
- Wx_BGColor = clBlack
- Wx_Class = 'wxStaticText'
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxStaticText'
Wx_ControlOrientation = wxControlVertical
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_LBLPRIORITY'
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_LBLPRIORITY'
Wx_IDValue = 1014
- Wx_LabelStyle = []
+ Wx_LabelStyle = []
Wx_Alignment = [wxALIGN_LEFT]
- end
- object LblUser: TWxStaticText
+ Wx_PaneCaption = 'LblPriority'
+ Wx_PaneName = 'LblPriority_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ object LblUser: TWxStaticText
Left = 190
Top = 5
- Width = 29
- Height = 17
- Caption = 'User:'
+ Width = 29
+ Height = 17
+ Caption = 'User:'
TabOrder = 1
- Wx_BGColor = clBlack
- Wx_Class = 'wxStaticText'
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxStaticText'
Wx_ControlOrientation = wxControlVertical
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_LBLUSER'
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_LBLUSER'
Wx_IDValue = 1015
- Wx_LabelStyle = []
+ Wx_LabelStyle = []
Wx_Alignment = [wxALIGN_LEFT]
Wx_StretchFactor = 1
- end
- object SpnPriority: TWxSpinCtrl
+ Wx_PaneCaption = 'LblUser'
+ Wx_PaneName = 'LblUser_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ object SpnPriority: TWxSpinCtrl
Left = 5
Top = 32
- Width = 113
- Height = 22
- MaxValue = 9
- MinValue = 1
+ Width = 113
+ Height = 22
+ MaxValue = 9
+ MinValue = 1
TabOrder = 2
- Value = 1
- Wx_BGColor = clBlack
- Wx_Class = 'wxSpinCtrl'
- Wx_SpinButtonStyle = []
- Wx_EditStyle = []
+ Value = 1
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxSpinCtrl'
+ Wx_SpinButtonStyle = []
+ Wx_EditStyle = []
Wx_ControlOrientation = wxControlVertical
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_SPNPRIORITY'
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_SPNPRIORITY'
Wx_IDValue = 1016
Wx_Alignment = [wxALIGN_LEFT]
- end
- object EdtUser: TWxEdit
+ Wx_PaneCaption = 'SpnPriority'
+ Wx_PaneName = 'SpnPriority_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ object EdtUser: TWxEdit
Left = 128
Top = 32
- Width = 153
- Height = 22
- BevelInner = bvNone
- BevelOuter = bvNone
- Modified = False
- AutoSize = False
+ Width = 153
+ Height = 22
+ BevelInner = bvNone
+ BevelOuter = bvNone
+ AutoSize = False
TabOrder = 3
- Wx_BGColor = clBlack
- Wx_Class = 'wxTextCtrl'
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxTextCtrl'
Wx_ControlOrientation = wxControlVertical
- Wx_EditStyle = []
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_EDTUSER'
+ Wx_EditStyle = []
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_EDTUSER'
Wx_IDValue = 1017
- Wx_Validator = 'wxTextValidator(wxFILTER_ALPHANUMERIC, NULL)'
+ Wx_Validator = 'wxTextValidator(wxFILTER_ALPHANUMERIC, NULL)'
Wx_Alignment = []
Wx_StretchFactor = 1
- Wx_MaxLength = 0
- end
- end
+ Wx_MaxLength = 0
+ Wx_PaneCaption = 'EdtUser'
+ Wx_PaneName = 'EdtUser_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ end
end
end
object WxStdDialogButtonSizer1: TWxStdDialogButtonSizer
Modified: trunk/wxdevide/source/ColorEditDlg.cpp
===================================================================
--- trunk/wxdevide/source/ColorEditDlg.cpp 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/ColorEditDlg.cpp 2011-12-04 03:10:39 UTC (rev 16)
@@ -58,99 +58,114 @@
//Add the custom code before or after the blocks
////GUI Items Creation Start
- WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxPoint(0,0), wxSize(472,166));
+ WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxPoint(0, 0), wxSize(472, 166));
+ WxPanel1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- RadDefaultColour = new wxRadioButton(WxPanel1, ID_RADDEFAULTCOLOUR, _("Use Default Colour"), wxPoint(8,16), wxSize(113,17), 0, wxDefaultValidator, _("RadDefaultColour"));
+ RadDefaultColour = new wxRadioButton(WxPanel1, ID_RADDEFAULTCOLOUR, wxT("Use Default Colour"), wxPoint(8, 16), wxSize(113, 17), 0, wxDefaultValidator, wxT("RadDefaultColour"));
RadDefaultColour->SetValue(true);
+ RadDefaultColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- RadStandardColour = new wxRadioButton(WxPanel1, ID_RADSTANDARDCOLOUR, _("Use Standard Colour"), wxPoint(8,48), wxSize(118,17), 0, wxDefaultValidator, _("RadStandardColour"));
+ RadStandardColour = new wxRadioButton(WxPanel1, ID_RADSTANDARDCOLOUR, wxT("Use Standard Colour"), wxPoint(8, 48), wxSize(118, 17), 0, wxDefaultValidator, wxT("RadStandardColour"));
+ RadStandardColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- RadSystemColour = new wxRadioButton(WxPanel1, ID_RADSYSTEMCOLOUR, _("Use System Colour"), wxPoint(8,80), wxSize(113,17), 0, wxDefaultValidator, _("RadSystemColour"));
+ RadSystemColour = new wxRadioButton(WxPanel1, ID_RADSYSTEMCOLOUR, wxT("Use System Colour"), wxPoint(8, 80), wxSize(113, 17), 0, wxDefaultValidator, wxT("RadSystemColour"));
+ RadSystemColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- RadCustomColour = new wxRadioButton(WxPanel1, ID_RADCUSTOMCOLOUR, _("Use Custom Colour"), wxPoint(8,112), wxSize(113,17), 0, wxDefaultValidator, _("RadCustomColour"));
+ RadCustomColour = new wxRadioButton(WxPanel1, ID_RADCUSTOMCOLOUR, wxT("Use Custom Colour"), wxPoint(8, 112), wxSize(113, 17), 0, wxDefaultValidator, wxT("RadCustomColour"));
+ RadCustomColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- WxStaticText1 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT1, _("Color Preview"), wxPoint(381,8), wxDefaultSize, 0, _("WxStaticText1"));
+ WxStaticText1 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT1, wxT("Color Preview"), wxPoint(381, 8), wxDefaultSize, 0, wxT("WxStaticText1"));
+ WxStaticText1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- PnlPreview = new wxPanel(WxPanel1, ID_PNLPREVIEW, wxPoint(368,24), wxSize(97,113), wxSIMPLE_BORDER);
+ PnlPreview = new wxPanel(WxPanel1, ID_PNLPREVIEW, wxPoint(368, 24), wxSize(97, 113), wxSIMPLE_BORDER);
+ PnlPreview->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- BtnOK = new wxButton(WxPanel1, ID_BTNOK, _("OK"), wxPoint(309,139), wxSize(75,25), 0, wxDefaultValidator, _("BtnOK"));
+ BtnOK = new wxButton(WxPanel1, ID_BTNOK, wxT("OK"), wxPoint(309, 139), wxSize(75, 25), 0, wxDefaultValidator, wxT("BtnOK"));
+ BtnOK->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- BtnCancel = new wxButton(WxPanel1, wxID_CANCEL, _("Cancel"), wxPoint(390,139), wxSize(75,25), 0, wxDefaultValidator, _("BtnCancel"));
+ BtnCancel = new wxButton(WxPanel1, wxID_CANCEL, wxT("Cancel"), wxPoint(390, 139), wxSize(75, 25), 0, wxDefaultValidator, wxT("BtnCancel"));
+ BtnCancel->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
wxArrayString arrayStringFor_CmbStandardColour;
- arrayStringFor_CmbStandardColour.Add(_("wxBLACK"));
- arrayStringFor_CmbStandardColour.Add(_("wxWHITE"));
- arrayStringFor_CmbStandardColour.Add(_("wxRED"));
- arrayStringFor_CmbStandardColour.Add(_("wxBLUE"));
- arrayStringFor_CmbStandardColour.Add(_("wxGREEN"));
- arrayStringFor_CmbStandardColour.Add(_("wxCYAN"));
- arrayStringFor_CmbStandardColour.Add(_("wxLIGHT_GREY"));
- CmbStandardColour = new wxComboBox(WxPanel1, ID_CMBSTANDARDCOLOUR, _("wxBLACK"), wxPoint(128,48), wxSize(230,21), arrayStringFor_CmbStandardColour, wxCB_READONLY, wxDefaultValidator, _("CmbStandardColour"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxBLACK"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxWHITE"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxRED"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxBLUE"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxGREEN"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxCYAN"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxLIGHT_GREY"));
+ CmbStandardColour = new wxComboBox(WxPanel1, ID_CMBSTANDARDCOLOUR, wxT("wxBLACK"), wxPoint(128, 48), wxSize(230, 21), arrayStringFor_CmbStandardColour, wxCB_READONLY, wxDefaultValidator, wxT("CmbStandardColour"));
CmbStandardColour->Enable(false);
+ CmbStandardColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
wxArrayString arrayStringFor_CmbSystemColour;
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_SCROLLBAR "));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BACKGROUND "));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_ACTIVECAPTION "));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INACTIVECAPTION"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_MENU"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_WINDOW"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_WINDOWFRAME"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_MENUTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_WINDOWTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_CAPTIONTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_ACTIVEBORDER"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INACTIVEBORDER"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_APPWORKSPACE"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_HIGHLIGHT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_HIGHLIGHTTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BTNFACE"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BTNSHADOW"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_GRAYTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BTNTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INACTIVECAPTIONTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BTNHIGHLIGHT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_3DDKSHADOW"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_3DLIGHT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INFOTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INFOBK"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_DESKTOP"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_3DFACE"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_3DSHADOW"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_3DHIGHLIGHT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_3DHILIGHT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BTNHILIGHT"));
- CmbSystemColour = new wxComboBox(WxPanel1, ID_CMBSYSTEMCOLOUR, _("wxSYS_COLOUR_SCROLLBAR"), wxPoint(128,80), wxSize(230,21), arrayStringFor_CmbSystemColour, wxCB_READONLY, wxDefaultValidator, _("CmbSystemColour"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_SCROLLBAR "));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_BACKGROUND "));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_ACTIVECAPTION "));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_INACTIVECAPTION"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_MENU"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_WINDOW"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_WINDOWFRAME"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_MENUTEXT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_WINDOWTEXT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_CAPTIONTEXT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_ACTIVEBORDER"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_INACTIVEBORDER"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_APPWORKSPACE"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_HIGHLIGHT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_HIGHLIGHTTEXT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_BTNFACE"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_BTNSHADOW"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_GRAYTEXT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_BTNTEXT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_INACTIVECAPTIONTEXT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_BTNHIGHLIGHT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_3DDKSHADOW"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_3DLIGHT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_INFOTEXT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_INFOBK"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_DESKTOP"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_3DFACE"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_3DSHADOW"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_3DHIGHLIGHT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_3DHILIGHT"));
+ arrayStringFor_CmbSystemColour.Add(wxT("wxSYS_COLOUR_BTNHILIGHT"));
+ CmbSystemColour = new wxComboBox(WxPanel1, ID_CMBSYSTEMCOLOUR, wxT("wxSYS_COLOUR_SCROLLBAR"), wxPoint(128, 80), wxSize(230, 21), arrayStringFor_CmbSystemColour, wxCB_READONLY, wxDefaultValidator, wxT("CmbSystemColour"));
CmbSystemColour->Enable(false);
+ CmbSystemColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- WxStaticText2 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT2, _("R"), wxPoint(128,116), wxDefaultSize, 0, _("WxStaticText2"));
+ WxStaticText2 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT2, wxT("R"), wxPoint(128, 116), wxDefaultSize, 0, wxT("WxStaticText2"));
WxStaticText2->SetForegroundColour(wxColour(255,0,0));
- WxStaticText2->SetFont(wxFont(8, wxSWISS, wxNORMAL,wxBOLD, false));
+ WxStaticText2->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("MS Sans Serif")));
- EdtRed = new wxTextCtrl(WxPanel1, ID_EDTRED, _("000"), wxPoint(142,112), wxSize(32,21), 0, wxTextValidator(wxFILTER_NUMERIC, NULL), _("EdtRed"));
+ EdtRed = new wxTextCtrl(WxPanel1, ID_EDTRED, wxT("000"), wxPoint(142, 112), wxSize(32, 21), 0, wxTextValidator(wxFILTER_NUMERIC, NULL), wxT("EdtRed"));
EdtRed->SetForegroundColour(wxColour(255,0,0));
+ EdtRed->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- WxStaticText3 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT3, _("G"), wxPoint(183,116), wxDefaultSize, 0, _("WxStaticText3"));
+ WxStaticText3 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT3, wxT("G"), wxPoint(183, 116), wxDefaultSize, 0, wxT("WxStaticText3"));
WxStaticText3->SetForegroundColour(wxColour(0,128,0));
- WxStaticText3->SetFont(wxFont(8, wxSWISS, wxNORMAL,wxBOLD, false));
+ WxStaticText3->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("MS Sans Serif")));
- WxStaticText4 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT4, _("B"), wxPoint(232,116), wxDefaultSize, 0, _("WxStaticText4"));
+ WxStaticText4 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT4, wxT("B"), wxPoint(232, 116), wxDefaultSize, 0, wxT("WxStaticText4"));
WxStaticText4->SetForegroundColour(wxColour(0,0,255));
- WxStaticText4->SetFont(wxFont(8, wxSWISS, wxNORMAL,wxBOLD, false));
+ WxStaticText4->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("MS Sans Serif")));
- EdtGreen = new wxTextCtrl(WxPanel1, ID_EDTGREEN, _("000"), wxPoint(195,112), wxSize(32,21), 0, wxTextValidator(wxFILTER_NUMERIC, NULL), _("EdtGreen"));
+ EdtGreen = new wxTextCtrl(WxPanel1, ID_EDTGREEN, wxT("000"), wxPoint(195, 112), wxSize(32, 21), 0, wxTextValidator(wxFILTER_NUMERIC, NULL), wxT("EdtGreen"));
EdtGreen->SetForegroundColour(wxColour(0,128,0));
+ EdtGreen->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- EdtBlue = new wxTextCtrl(WxPanel1, ID_EDTBLUE, _("000"), wxPoint(245,112), wxSize(32,21), 0, wxTextValidator(wxFILTER_NUMERIC, NULL), _("EdtBlue"));
+ EdtBlue = new wxTextCtrl(WxPanel1, ID_EDTBLUE, wxT("000"), wxPoint(245, 112), wxSize(32, 21), 0, wxTextValidator(wxFILTER_NUMERIC, NULL), wxT("EdtBlue"));
EdtBlue->SetForegroundColour(wxColour(0,0,255));
+ EdtBlue->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- BtnChooseColour = new wxButton(WxPanel1, ID_BTNCHOOSECOLOUR, _("Choose"), wxPoint(288,112), wxSize(68,21), 0, wxDefaultValidator, _("BtnChooseColour"));
+ BtnChooseColour = new wxButton(WxPanel1, ID_BTNCHOOSECOLOUR, wxT("Choose"), wxPoint(288, 112), wxSize(68, 21), 0, wxDefaultValidator, wxT("BtnChooseColour"));
+ BtnChooseColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
WxColourDialog1 = new wxColourDialog(this);
- SetTitle(_("Color Editor"));
+ SetTitle(wxT("Color Editor"));
SetIcon(wxNullIcon);
- SetSize(8,8,480,194);
+ SetSize(8,8,488,202);
Center();
////GUI Items Creation End
Modified: trunk/wxdevide/source/ColorEditDlg.wxform
===================================================================
--- trunk/wxdevide/source/ColorEditDlg.wxform 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/ColorEditDlg.wxform 2011-12-04 03:10:39 UTC (rev 16)
@@ -1,4 +1,4 @@
-object frmNewForm_3: TfrmNewForm
+object frmNewForm_1: TfrmNewForm
Left = 8
Top = 8
AutoScroll = False
@@ -13,8 +13,9 @@
Font.Name = 'MS Sans Serif'
Font.Style = []
OldCreateOrder = True
- PopupMenu = MainForm.DesignerPopup
+ PopupMenu = DesignerPopup.Owner
Visible = True
+ OnClick = FormClick
OnCreate = FormCreate
OnDestroy = FormDestroy
OnResize = FormResize
@@ -31,6 +32,7 @@
Wx_DialogStyle = [wxCAPTION, wxSYSTEM_MENU, wxDIALOG_NO_PARENT, wxCLOSE_BOX]
Wx_Border = 0
Wx_BorderAlignment = []
+ isAuimanagerAvailable = False
PixelsPerInch = 96
TextHeight = 13
object WxPanel1: TWxPanel
@@ -42,6 +44,7 @@
TabOrder = 0
Wx_BKColor = clBlack
Wx_Class = 'wxPanel'
+ Wx_ControlOrientation = wxControlVertical
Wx_Default = False
Wx_EventList.Strings = (
'EVT_UPDATE_UI:OnUpdateUI')
@@ -50,6 +53,22 @@
Wx_Hidden = False
Wx_IDName = 'ID_WXPANEL1'
Wx_IDValue = 1007
+ Wx_PaneCaption = 'WxPanel1'
+ Wx_PaneName = 'WxPanel1_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
object RadDefaultColour: TWxRadioButton
Left = 8
Top = 16
@@ -62,11 +81,28 @@
EVT_RADIOBUTTON = 'RadDefaultColourClick'
Wx_BGColor = clBlack
Wx_Class = 'wxRadioButton'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_IDName = 'ID_RADDEFAULTCOLOUR'
Wx_IDValue = 1018
Wx_RadioButtonStyle = []
+ Wx_PaneCaption = 'RadDefaultColour'
+ Wx_PaneName = 'RadDefaultColour_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object RadStandardColour: TWxRadioButton
Left = 8
@@ -78,11 +114,28 @@
EVT_RADIOBUTTON = 'RadStandardColorClick'
Wx_BGColor = clBlack
Wx_Class = 'wxRadioButton'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_IDName = 'ID_RADSTANDARDCOLOUR'
Wx_IDValue = 1019
Wx_RadioButtonStyle = []
+ Wx_PaneCaption = 'RadStandardColour'
+ Wx_PaneName = 'RadStandardColour_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object RadSystemColour: TWxRadioButton
Left = 8
@@ -94,11 +147,28 @@
EVT_RADIOBUTTON = 'RadSystemColourClick'
Wx_BGColor = clBlack
Wx_Class = 'wxRadioButton'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_IDName = 'ID_RADSYSTEMCOLOUR'
Wx_IDValue = 1020
Wx_RadioButtonStyle = []
+ Wx_PaneCaption = 'RadSystemColour'
+ Wx_PaneName = 'RadSystemColour_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object RadCustomColour: TWxRadioButton
Left = 8
@@ -110,11 +180,28 @@
EVT_RADIOBUTTON = 'RadCustomColourClick'
Wx_BGColor = clBlack
Wx_Class = 'wxRadioButton'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_IDName = 'ID_RADCUSTOMCOLOUR'
Wx_IDValue = 1021
Wx_RadioButtonStyle = []
+ Wx_PaneCaption = 'RadCustomColour'
+ Wx_PaneName = 'RadCustomColour_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object WxStaticText1: TWxStaticText
Left = 381
@@ -125,6 +212,7 @@
TabOrder = 4
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
@@ -132,6 +220,22 @@
Wx_IDValue = 1022
Wx_LabelStyle = []
Wx_Border = 4
+ Wx_PaneCaption = 'WxStaticText1'
+ Wx_PaneName = 'WxStaticText1_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object PnlPreview: TWxPanel
Left = 368
@@ -141,6 +245,7 @@
TabOrder = 5
Wx_BKColor = clBlack
Wx_Class = 'wxPanel'
+ Wx_ControlOrientation = wxControlVertical
Wx_Default = False
Wx_EventList.Strings = (
'EVT_UPDATE_UI:OnUpdateUI')
@@ -149,6 +254,22 @@
Wx_Hidden = False
Wx_IDName = 'ID_PNLPREVIEW'
Wx_IDValue = 1023
+ Wx_PaneCaption = 'PnlPreview'
+ Wx_PaneName = 'PnlPreview_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object BtnOK: TWxButton
Left = 309
@@ -161,6 +282,7 @@
Wx_BKColor = clBlack
Wx_ButtonStyle = []
Wx_Class = 'wxButton'
+ Wx_ControlOrientation = wxControlVertical
Wx_Default = False
Wx_EventList.Strings = (
'EVT_BUTTON:OnClick'
@@ -170,6 +292,22 @@
Wx_Hidden = False
Wx_IDName = 'ID_BTNOK'
Wx_IDValue = 1024
+ Wx_PaneCaption = 'BtnOK'
+ Wx_PaneName = 'BtnOK_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object BtnCancel: TWxButton
Left = 390
@@ -181,6 +319,7 @@
Wx_BKColor = clBlack
Wx_ButtonStyle = []
Wx_Class = 'wxButton'
+ Wx_ControlOrientation = wxControlVertical
Wx_Default = False
Wx_EventList.Strings = (
'EVT_BUTTON:OnClick'
@@ -190,6 +329,22 @@
Wx_Hidden = False
Wx_IDName = 'wxID_CANCEL'
Wx_IDValue = 1025
+ Wx_PaneCaption = 'BtnCancel'
+ Wx_PaneName = 'BtnCancel_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object CmbStandardColour: TWxComboBox
Left = 128
@@ -212,12 +367,29 @@
Wx_Class = 'wxComboBox'
Wx_ComboboxStyle = [wxCB_READONLY]
Wx_EditStyle = []
+ Wx_ControlOrientation = wxControlVertical
Wx_Enabled = False
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_CMBSTANDARDCOLOUR'
Wx_IDValue = 1026
+ Wx_PaneCaption = 'CmbStandardColour'
+ Wx_PaneName = 'CmbStandardColour_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object CmbSystemColour: TWxComboBox
Left = 128
@@ -264,12 +436,29 @@
Wx_Class = 'wxComboBox'
Wx_ComboboxStyle = [wxCB_READONLY]
Wx_EditStyle = []
+ Wx_ControlOrientation = wxControlVertical
Wx_Enabled = False
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_CMBSYSTEMCOLOUR'
Wx_IDValue = 1027
+ Wx_PaneCaption = 'CmbSystemColour'
+ Wx_PaneName = 'CmbSystemColour_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object WxStaticText2: TWxStaticText
Left = 128
@@ -286,6 +475,7 @@
TabOrder = 10
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
@@ -293,6 +483,22 @@
Wx_IDValue = 1028
Wx_LabelStyle = []
InvisibleFGColorString = 'CUS:255,0,0'
+ Wx_PaneCaption = 'WxStaticText2'
+ Wx_PaneName = 'WxStaticText2_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object EdtRed: TWxEdit
Left = 142
@@ -301,7 +507,6 @@
Height = 21
BevelInner = bvNone
BevelOuter = bvNone
- Modified = False
AutoSize = False
Font.Charset = DEFAULT_CHARSET
Font.Color = clRed
@@ -314,6 +519,7 @@
EVT_TEXT_ENTER = 'EdtRedEnter'
Wx_BGColor = clBlack
Wx_Class = 'wxTextCtrl'
+ Wx_ControlOrientation = wxControlVertical
Wx_EditStyle = []
Wx_FGColor = clBlack
Wx_GeneralStyle = []
@@ -323,6 +529,22 @@
Wx_Validator = 'wxTextValidator(wxFILTER_NUMERIC, NULL)'
Wx_MaxLength = 0
InvisibleFGColorString = 'CUS:255,0,0'
+ Wx_PaneCaption = 'EdtRed'
+ Wx_PaneName = 'EdtRed_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object WxStaticText3: TWxStaticText
Left = 183
@@ -339,6 +561,7 @@
TabOrder = 12
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
@@ -346,6 +569,22 @@
Wx_IDValue = 1030
Wx_LabelStyle = []
InvisibleFGColorString = 'CUS:0,128,0'
+ Wx_PaneCaption = 'WxStaticText3'
+ Wx_PaneName = 'WxStaticText3_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object WxStaticText4: TWxStaticText
Left = 232
@@ -362,6 +601,7 @@
TabOrder = 13
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
@@ -369,6 +609,22 @@
Wx_IDValue = 1031
Wx_LabelStyle = []
InvisibleFGColorString = 'CUS:0,0,255'
+ Wx_PaneCaption = 'WxStaticText4'
+ Wx_PaneName = 'WxStaticText4_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object EdtGreen: TWxEdit
Left = 195
@@ -377,7 +633,6 @@
Height = 21
BevelInner = bvNone
BevelOuter = bvNone
- Modified = False
AutoSize = False
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
@@ -390,6 +645,7 @@
EVT_TEXT_ENTER = 'EdtRedEnter'
Wx_BGColor = clBlack
Wx_Class = 'wxTextCtrl'
+ Wx_ControlOrientation = wxControlVertical
Wx_EditStyle = []
Wx_FGColor = clBlack
Wx_GeneralStyle = []
@@ -399,6 +655,22 @@
Wx_Validator = 'wxTextValidator(wxFILTER_NUMERIC, NULL)'
Wx_MaxLength = 0
InvisibleFGColorString = 'CUS:0,128,0'
+ Wx_PaneCaption = 'EdtGreen'
+ Wx_PaneName = 'EdtGreen_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object EdtBlue: TWxEdit
Left = 245
@@ -407,7 +679,6 @@
Height = 21
BevelInner = bvNone
BevelOuter = bvNone
- Modified = False
AutoSize = False
Font.Charset = DEFAULT_CHARSET
Font.Color = clBlue
@@ -420,6 +691,7 @@
EVT_TEXT_ENTER = 'EdtRedEnter'
Wx_BGColor = clBlack
Wx_Class = 'wxTextCtrl'
+ Wx_ControlOrientation = wxControlVertical
Wx_EditStyle = []
Wx_FGColor = clBlack
Wx_GeneralStyle = []
@@ -429,6 +701,22 @@
Wx_Validator = 'wxTextValidator(wxFILTER_NUMERIC, NULL)'
Wx_MaxLength = 0
InvisibleFGColorString = 'CUS:0,0,255'
+ Wx_PaneCaption = 'EdtBlue'
+ Wx_PaneName = 'EdtBlue_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
object BtnChooseColour: TWxButton
Left = 288
@@ -441,6 +729,7 @@
Wx_BKColor = clBlack
Wx_ButtonStyle = []
Wx_Class = 'wxButton'
+ Wx_ControlOrientation = wxControlVertical
Wx_Default = False
Wx_EventList.Strings = (
'EVT_BUTTON:OnClick'
@@ -450,6 +739,22 @@
Wx_Hidden = False
Wx_IDName = 'ID_BTNCHOOSECOLOUR'
Wx_IDValue = 1034
+ Wx_PaneCaption = 'BtnChooseColour'
+ Wx_PaneName = 'BtnChooseColour_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
end
end
object WxColourDialog1: TWxColourDialog
Modified: trunk/wxdevide/source/CompileProgressForm.cpp
===================================================================
--- trunk/wxdevide/source/CompileProgressForm.cpp 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/CompileProgressForm.cpp 2011-12-04 03:10:39 UTC (rev 16)
@@ -1,11 +1,12 @@
-//---------------------------------------------------------------------------
-// // $Id$
-// Name: CompileProgressForm.cpp
-// Author: Programming
-// Created: 11/04/2008 08:48:26
-// Description: TCompileProgressForm class implementation
-//
-//---------------------------------------------------------------------------
+///-----------------------------------------------------------------
+///
+/// @file CompileProgressForm.cpp
+/// @author tony
+/// Created: 12/3/2011 6:49:02 PM
+/// @section DESCRIPTION
+/// TCompileProgressForm class implementation
+///
+///------------------------------------------------------------------
#include "CompileProgressForm.h"
@@ -21,9 +22,10 @@
//Add Custom Events only in the appropriate block.
//Code added in other places will be removed by wxDev-C++
////Event Table Start
-BEGIN_EVENT_TABLE(TCompileProgressForm, wxFrame)
+BEGIN_EVENT_TABLE(TCompileProgressForm,wxFrame)
////Manual Code Start
////Manual Code End
+
EVT_CLOSE(TCompileProgressForm::OnClose)
END_EVENT_TABLE()
////Event Table End
@@ -45,6 +47,12 @@
//wxDev-C++ designer will remove them.
//Add the custom code before or after the blocks
////GUI Items Creation Start
+
+ SetTitle(wxT("Compile Progress"));
+ SetIcon(wxNullIcon);
+ SetSize(8,8,320,334);
+ Center();
+
////GUI Items Creation End
}
Modified: trunk/wxdevide/source/CompileProgressForm.h
===================================================================
--- trunk/wxdevide/source/CompileProgressForm.h 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/CompileProgressForm.h 2011-12-04 03:10:39 UTC (rev 16)
@@ -1,14 +1,15 @@
-//---------------------------------------------------------------------------
-// // $Id$
-// Name: CompileProgressForm.h
-// Author: Programming
-// Created: 11/04/2008 08:48:26
-// Description: TCompileProgressForm class declaration
-//
-//---------------------------------------------------------------------------
+///-----------------------------------------------------------------
+///
+/// @file CompileProgressForm.h
+/// @author tony
+/// Created: 12/3/2011 6:49:02 PM
+/// @section DESCRIPTION
+/// TCompileProgressForm class declaration
+///
+///------------------------------------------------------------------
-#ifndef __TCOMPILEPROGRESSFORM_h__
-#define __TCOMPILEPROGRESSFORM_h__
+#ifndef __TCOMPILEPROGRESSFORM_H__
+#define __TCOMPILEPROGRESSFORM_H__
#ifdef __BORLANDC__
#pragma hdrstop
@@ -28,7 +29,8 @@
////Header Include End
////Dialog Style Start
-#define TCompileProgressForm_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxMINIMIZE_BOX | wxCLOSE_BOX
+#undef TCompileProgressForm_STYLE
+#define TCompileProgressForm_STYLE wxCAPTION | wxSYSTEM_MENU | wxMINIMIZE_BOX | wxCLOSE_BOX
////Dialog Style End
class TCompileProgressForm : public wxFrame
Modified: trunk/wxdevide/source/CompileProgressForm.wxform
===================================================================
--- trunk/wxdevide/source/CompileProgressForm.wxform 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/CompileProgressForm.wxform 2011-12-04 03:10:39 UTC (rev 16)
@@ -1,15 +1,16 @@
-object TfrmNewForm
- Left = 338
- Top = 179
+object frmNewForm_4: TfrmNewForm
+ Left = 8
+ Top = 8
AutoScroll = False
BorderIcons = [biSystemMenu, biMinimize]
Caption = 'Compile Progress'
- ClientHeight = 307
- ClientWidth = 312
+ ClientHeight = 298
+ ClientWidth = 304
Color = clAppWorkSpace
OldCreateOrder = True
- Position = poDesktopCenter
- OnCloseQuery = FormCloseQuery
+ PopupMenu = DesignerPopup.Owner
+ Visible = True
+ OnClick = FormClick
OnCreate = FormCreate
OnDestroy = FormDestroy
OnResize = FormResize
@@ -26,6 +27,7 @@
Wx_DesignerType = dtWxFrame
Wx_Border = 0
Wx_BorderAlignment = []
+ isAuimanagerAvailable = False
PixelsPerInch = 96
- TextHeight = 16
+ TextHeight = 15
end
Modified: trunk/wxdevide/source/Compiler.cpp
===================================================================
--- trunk/wxdevide/source/Compiler.cpp 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/Compiler.cpp 2011-12-04 03:10:39 UTC (rev 16)
@@ -1865,7 +1865,7 @@
{
if(CompileProgressForm == NULL)
{
- CompileProgressForm = new TCompileProgressFrm(wxGetApp().GetMainFrame());
+ // CompileProgressForm = new TCompileProgressForm(wxGetApp().GetMainFrame());
}
/*// WITH CompileProgressForm {
Modified: trunk/wxdevide/source/Compiler.h
===================================================================
--- trunk/wxdevide/source/Compiler.h 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/Compiler.h 2011-12-04 03:10:39 UTC (rev 16)
@@ -68,7 +68,7 @@
#include "Graphics.h"*/
-static const wxString RmExe = "rm -f";
+static const wxString RmExe = wxT("rm -f");
typedef enum TTarget { ctNone, ctFile, ctProject };
Modified: trunk/wxdevide/source/DevCfg.cpp
===================================================================
--- trunk/wxdevide/source/DevCfg.cpp 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/DevCfg.cpp 2011-12-04 03:10:39 U...
[truncated message content] |
