Merge pull request #132 from victorlevasseur/bugfix/gtk3-glitches

Fix some widgets not sized correctly under GTK3/Gnome 3
2025-10-15 10:19:04 +00:00 · 2015-06-07 22:58:33 +12:00
parent 2008bbbe4a 6a15278034
commit 1cef60cb01
10 changed files with 2500 additions and 2525 deletions
--- a/Core/GDCore.cbp
+++ b/Core/GDCore.cbp
@@ -487,15 +487,6 @@
 			<code_completion />
 			<envvars />
 			<debugger />
-			<DoxyBlocks>
-				<comment_style block="0" line="0" />
-				<doxyfile_project output_directory="doc" />
-				<doxyfile_build />
-				<doxyfile_warnings />
-				<doxyfile_output />
-				<doxyfile_dot have_dot="1" />
-				<general />
-			</DoxyBlocks>
 			<wxsmith version="1">
 				<resources>
 					<wxDialog wxs="wxsmith/ChooseVariableDialog.wxs" src="GDCore\IDE\Dialogs\ChooseVariableDialog.cpp" hdr="GDCore\IDE\Dialogs\ChooseVariableDialog.h" fwddecl="0" i18n="1" name="ChooseVariableDialog" language="CPP" />
@@ -523,12 +514,6 @@
 					<wxPanel wxs="wxsmith/ResourcesEditor.wxs" src="GDCore\IDE\Dialogs\ResourcesEditor.cpp" hdr="GDCore\IDE\Dialogs\ResourcesEditor.h" fwddecl="0" i18n="1" name="ResourcesEditor" language="CPP" />
 				</resources>
 			</wxsmith>
-			<AutoVersioning>
-				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="0" date_declarations="1" update_manifest="0" do_auto_increment="1" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="GDCore\Tools\Version.h" />
-				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
-				<Code header_guard="VERSION_H" namespace="AutoVersion" prefix="GDCore" />
-			</AutoVersioning>
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
--- a/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp
+++ b/Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp
@@ -78,7 +78,7 @@ tempLayer(layer_)
 	FlexGridSizer2 = new wxFlexGridSizer(0, 3, 0, 0);
 	StaticText1 = new wxStaticText(this, ID_STATICTEXT1, _("Name :"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT1"));
 	FlexGridSizer2->Add(StaticText1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	nameEdit = new wxTextCtrl(this, ID_TEXTCTRL1, wxEmptyString, wxDefaultPosition, wxSize(129,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL1"));
+	nameEdit = new wxTextCtrl(this, ID_TEXTCTRL1, wxEmptyString, wxDefaultPosition, wxSize(129,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL1"));
 	FlexGridSizer2->Add(nameEdit, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	visibilityCheck = new wxCheckBox(this, ID_CHECKBOX1, _("Visible"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_CHECKBOX1"));
 	visibilityCheck->SetValue(false);
@@ -89,7 +89,9 @@ tempLayer(layer_)
 	FlexGridSizer5 = new wxFlexGridSizer(0, 4, 0, 0);
 	StaticText2 = new wxStaticText(this, ID_STATICTEXT2, _("Camera No."), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2"));
 	FlexGridSizer5->Add(StaticText2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	cameraChoice = new wxChoice(this, ID_CHOICE1, wxDefaultPosition, wxSize(37,21), 0, 0, 0, wxDefaultValidator, _T("ID_CHOICE1"));
+	cameraChoice = new wxChoice(this, ID_CHOICE1, wxDefaultPosition, wxSize(50,-1), 0, 0, 0, wxDefaultValidator, _T("ID_CHOICE1"));
+	cameraChoice->Append("00");
+	cameraChoice->SetSelection(0);
 	FlexGridSizer5->Add(cameraChoice, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	deleteCameraBt = new wxButton(this, ID_BUTTON5, _("Delete"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON5"));
 	FlexGridSizer5->Add(deleteCameraBt, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
@@ -103,12 +105,12 @@ tempLayer(layer_)
 	sizeCheck = new wxCheckBox(this, ID_CHECKBOX2, _("Custom size :"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_CHECKBOX2"));
 	sizeCheck->SetValue(false);
 	FlexGridSizer8->Add(sizeCheck, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	cameraWidthEdit = new wxTextCtrl(this, ID_TEXTCTRL2, wxEmptyString, wxDefaultPosition, wxSize(52,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL2"));
+	cameraWidthEdit = new wxTextCtrl(this, ID_TEXTCTRL2, wxEmptyString, wxDefaultPosition, wxSize(60,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL2"));
 	cameraWidthEdit->Disable();
 	FlexGridSizer8->Add(cameraWidthEdit, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	StaticText4 = new wxStaticText(this, ID_STATICTEXT4, _("x"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4"));
 	FlexGridSizer8->Add(StaticText4, 1, wxTOP|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	cameraHeightEdit = new wxTextCtrl(this, ID_TEXTCTRL3, wxEmptyString, wxDefaultPosition, wxSize(52,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL3"));
+	cameraHeightEdit = new wxTextCtrl(this, ID_TEXTCTRL3, wxEmptyString, wxDefaultPosition, wxSize(60,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL3"));
 	cameraHeightEdit->Disable();
 	FlexGridSizer8->Add(cameraHeightEdit, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	FlexGridSizer6->Add(FlexGridSizer8, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0);
@@ -119,22 +121,22 @@ tempLayer(layer_)
 	FlexGridSizer9 = new wxFlexGridSizer(0, 8, 0, 0);
 	StaticText7 = new wxStaticText(this, ID_STATICTEXT7, _("From"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT7"));
 	FlexGridSizer9->Add(StaticText7, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	viewportX1Edit = new wxTextCtrl(this, ID_TEXTCTRL4, _("0"), wxDefaultPosition, wxSize(35,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL4"));
+	viewportX1Edit = new wxTextCtrl(this, ID_TEXTCTRL4, _("0"), wxDefaultPosition, wxSize(40,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL4"));
 	viewportX1Edit->Disable();
 	FlexGridSizer9->Add(viewportX1Edit, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	StaticText6 = new wxStaticText(this, ID_STATICTEXT6, _(";"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT6"));
 	FlexGridSizer9->Add(StaticText6, 1, wxTOP|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	viewportY1Edit = new wxTextCtrl(this, ID_TEXTCTRL5, _("0"), wxDefaultPosition, wxSize(35,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL5"));
+	viewportY1Edit = new wxTextCtrl(this, ID_TEXTCTRL5, _("0"), wxDefaultPosition, wxSize(40,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL5"));
 	viewportY1Edit->Disable();
 	FlexGridSizer9->Add(viewportY1Edit, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	StaticText8 = new wxStaticText(this, ID_STATICTEXT8, _("to"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT8"));
 	FlexGridSizer9->Add(StaticText8, 1, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	viewportX2Edit = new wxTextCtrl(this, ID_TEXTCTRL6, _("1"), wxDefaultPosition, wxSize(35,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL6"));
+	viewportX2Edit = new wxTextCtrl(this, ID_TEXTCTRL6, _("1"), wxDefaultPosition, wxSize(40,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL6"));
 	viewportX2Edit->Disable();
 	FlexGridSizer9->Add(viewportX2Edit, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	StaticText9 = new wxStaticText(this, ID_STATICTEXT9, _(";"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT9"));
 	FlexGridSizer9->Add(StaticText9, 1, wxTOP|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-	viewportY2Edit = new wxTextCtrl(this, ID_TEXTCTRL7, _("1"), wxDefaultPosition, wxSize(35,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL7"));
+	viewportY2Edit = new wxTextCtrl(this, ID_TEXTCTRL7, _("1"), wxDefaultPosition, wxSize(40,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL7"));
 	viewportY2Edit->Disable();
 	FlexGridSizer9->Add(viewportY2Edit, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 	FlexGridSizer7->Add(FlexGridSizer9, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 0);
@@ -187,11 +189,14 @@ tempLayer(layer_)
 	nameEdit->ChangeValue(layer.GetName());
 	visibilityCheck->SetValue(layer.GetVisibility());

-	//Impossible de modifier le nom du calque de base
+	//Can't edit the base layer's name
 	if ( layer.GetName() == "" )
-        nameEdit->SetEditable(false);
-
+	{
+        nameEdit->Disable();
+        nameEdit->SetValue(_("Base layer"));
+	}

+    cameraChoice->Clear();
    for (unsigned int i = 0;i<layer.GetCameraCount();++i)
    	cameraChoice->Append(ToString(i));

@@ -214,13 +219,15 @@ void EditLayerDialog::OncancelBtClick(wxCommandEvent& event)
 void EditLayerDialog::OnokBtClick(wxCommandEvent& event)
 {
    //Obligation d'avoir un nom sauf pour le calque de base
-    if ( nameEdit->GetValue() == "" && nameEdit->IsEditable() )
+    if ( nameEdit->GetValue() == "" && nameEdit->IsEnabled() )
    {
        gd::LogWarning(_("The name is incorrect"));
        return;
    }

-    tempLayer.SetName(ToString(nameEdit->GetValue()));
+    if( layer.GetName() != "")
+    	tempLayer.SetName(ToString(nameEdit->GetValue()));
+    
    tempLayer.SetVisibility(visibilityCheck->GetValue());

    layer = tempLayer;
--- a/Core/GDCore/IDE/Dialogs/ParameterControlsHelper.cpp
+++ b/Core/GDCore/IDE/Dialogs/ParameterControlsHelper.cpp
@@ -48,6 +48,7 @@ void ParameterControlsHelper::UpdateControls(unsigned int count)
        paramSpacers2.push_back(new wxPanel(window));
        paramEdits.push_back(new wxTextCtrl( window, ID_EDITARRAY, "", wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T( "EditPara" + num )));
        paramBmpBts.push_back(new wxBitmapButton( window, id, gd::CommonBitmapManager::Get()->expressionBt, wxDefaultPosition, wxSize(32,-1), wxBU_AUTODRAW, wxDefaultValidator, num));
+        paramBmpBts.back()->SetMinSize(wxSize(32, 32));

        //Connecting events
        window->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ParameterControlsHelper::OnParameterBtClick, this, id);
@@ -59,7 +60,7 @@ void ParameterControlsHelper::UpdateControls(unsigned int count)
        sizer->Add( paramSpacers1.back(), 0, 0 );
        sizer->Add( paramSpacers2.back(), 0, 0 );
        sizer->Add( paramEdits.back(), 1, wxALL | wxALIGN_LEFT | wxEXPAND | wxALIGN_CENTER_VERTICAL, 5 );
-        sizer->Add( paramBmpBts.back(), 0, wxALL | wxALIGN_LEFT | wxEXPAND | wxALIGN_CENTER_VERTICAL, 5 );
+        sizer->Add( paramBmpBts.back(), 0, wxALL | wxALIGN_LEFT | wxFIXED_MINSIZE | wxALIGN_CENTER_VERTICAL, 5 );

        paramSpacers1.back()->Show(false);
        paramSpacers2.back()->Show(false);
--- a/Core/wxsmith/EditLayerDialog.wxs
+++ b/Core/wxsmith/EditLayerDialog.wxs
@@ -18,7 +18,7 @@
 					</object>
 					<object class="sizeritem">
 						<object class="wxTextCtrl" name="ID_TEXTCTRL1" variable="nameEdit" member="yes">
-							<size>129,21</size>
+							<size>189,-1</size>
 						</object>
 						<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 						<border>5</border>
@@ -55,9 +55,10 @@
 									</object>
 									<object class="sizeritem">
 										<object class="wxChoice" name="ID_CHOICE1" variable="cameraChoice" member="yes">
+											<content>
+												<item>00</item>
+											</content>
 											<selection>0</selection>
-											<size>37,21</size>
-											<handler function="OncameraChoiceSelect" entry="EVT_CHOICE" />
 										</object>
 										<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 										<border>5</border>
@@ -98,7 +99,6 @@
 													<object class="sizeritem">
 														<object class="wxCheckBox" name="ID_CHECKBOX2" variable="sizeCheck" member="yes">
 															<label>Custom size :</label>
-															<handler function="OnsizeCheckClick" entry="EVT_CHECKBOX" />
 														</object>
 														<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 														<border>5</border>
@@ -106,9 +106,8 @@
 													</object>
 													<object class="sizeritem">
 														<object class="wxTextCtrl" name="ID_TEXTCTRL2" variable="cameraWidthEdit" member="yes">
-															<size>52,21</size>
+															<size>60,-1</size>
 															<enabled>0</enabled>
-															<handler function="OncameraWidthEditText" entry="EVT_TEXT" />
 														</object>
 														<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 														<border>5</border>
@@ -124,9 +123,8 @@
 													</object>
 													<object class="sizeritem">
 														<object class="wxTextCtrl" name="ID_TEXTCTRL3" variable="cameraHeightEdit" member="yes">
-															<size>52,21</size>
+															<size>60,-1</size>
 															<enabled>0</enabled>
-															<handler function="OncameraHeightEditText" entry="EVT_TEXT" />
 														</object>
 														<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 														<border>5</border>
@@ -162,9 +160,8 @@
 															<object class="sizeritem">
 																<object class="wxTextCtrl" name="ID_TEXTCTRL4" variable="viewportX1Edit" member="yes">
 																	<value>0</value>
-																	<size>35,21</size>
+																	<size>40,-1</size>
 																	<enabled>0</enabled>
-																	<handler function="OnviewportX1EditText" entry="EVT_TEXT" />
 																</object>
 																<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 																<border>5</border>
@@ -181,9 +178,8 @@
 															<object class="sizeritem">
 																<object class="wxTextCtrl" name="ID_TEXTCTRL5" variable="viewportY1Edit" member="yes">
 																	<value>0</value>
-																	<size>35,21</size>
+																	<size>40,-1</size>
 																	<enabled>0</enabled>
-																	<handler function="OnviewportX1EditText" entry="EVT_TEXT" />
 																</object>
 																<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 																<border>5</border>
@@ -200,9 +196,8 @@
 															<object class="sizeritem">
 																<object class="wxTextCtrl" name="ID_TEXTCTRL6" variable="viewportX2Edit" member="yes">
 																	<value>1</value>
-																	<size>35,21</size>
+																	<size>40,-1</size>
 																	<enabled>0</enabled>
-																	<handler function="OnviewportX1EditText" entry="EVT_TEXT" />
 																</object>
 																<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 																<border>5</border>
@@ -219,9 +214,8 @@
 															<object class="sizeritem">
 																<object class="wxTextCtrl" name="ID_TEXTCTRL7" variable="viewportY2Edit" member="yes">
 																	<value>1</value>
-																	<size>35,21</size>
+																	<size>40,-1</size>
 																	<enabled>0</enabled>
-																	<handler function="OnviewportX1EditText" entry="EVT_TEXT" />
 																</object>
 																<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 																<border>5</border>
@@ -240,6 +234,7 @@
 													<label>For example, a camera which takes the left side of the window would be defined with 0, 0, 0.5, 1.&#x0A;By default, a camera has a viewport which covers the entire window.</label>
 													<font>
 														<style>italic</style>
+														<sysfont>wxSYS_DEFAULT_GUI_FONT</sysfont>
 													</font>
 													<style>wxALIGN_RIGHT</style>
 												</object>
--- a/IDE/IDE.cbp
+++ b/IDE/IDE.cbp
@@ -773,21 +773,6 @@
 					<wxPanel wxs="wxsmith/ObjectsEditor.wxs" src="Dialogs\ObjectsEditor.cpp" hdr="Dialogs\ObjectsEditor.h" fwddecl="0" i18n="1" name="ObjectsEditor" language="CPP" />
 				</resources>
 			</wxsmith>
-			<AutoVersioning>
-				<Scheme minor_max="1" build_max="0" rev_max="0" rev_rand_max="9" build_times_to_increment_minor="1" />
-				<Settings autoincrement="0" date_declarations="1" update_manifest="1" do_auto_increment="1" ask_to_increment="0" language="C++" svn="0" svn_directory="C:\Users\Florian\Programmation\GDevelop SVN\conf" header_path="" />
-				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
-				<Code header_guard="VERSION_H" namespace="AutoVersion" prefix="" />
-			</AutoVersioning>
-			<DoxyBlocks>
-				<comment_style block="0" line="0" />
-				<doxyfile_project output_directory="doc" />
-				<doxyfile_build />
-				<doxyfile_warnings />
-				<doxyfile_output html_help="1" />
-				<doxyfile_dot have_dot="1" />
-				<general />
-			</DoxyBlocks>
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
--- a/IDE/IDE.layout
+++ b/IDE/IDE.layout
--- a/IDE/InstructionSelectorDialog.cpp
+++ b/IDE/InstructionSelectorDialog.cpp
@@ -208,7 +208,7 @@ InstructionSelectorDialog::InstructionSelectorDialog(wxWindow* parent, gd::Proje
    if (editingAction) invertBox->Show(false);
    RefreshList();
    Center();
-    SetSize(800, 600);
+    SetSize(-1, 600);
 }

 InstructionSelectorDialog::~InstructionSelectorDialog()
--- a/IDE/Preferences.cpp
+++ b/IDE/Preferences.cpp
--- a/IDE/Preferences.h
+++ b/IDE/Preferences.h
@@ -2,23 +2,23 @@
 #define PREFERENCES_H

 //(*Headers(Preferences)
-#include <wx/fontdlg.h>
-#include <wx/notebook.h>
-#include <wx/sizer.h>
-#include <wx/stattext.h>
-#include <wx/radiobox.h>
-#include <wx/textctrl.h>
-#include <wx/checkbox.h>
 #include <wx/spinctrl.h>
-#include <wx/propgrid/propgrid.h>
-#include <wx/statline.h>
+#include <wx/checkbox.h>
+#include <wx/dialog.h>
+#include <wx/sizer.h>
+#include <wx/notebook.h>
+#include <wx/button.h>
 #include <wx/radiobut.h>
 #include <wx/panel.h>
-#include <wx/choice.h>
-#include <wx/statbmp.h>
-#include <wx/button.h>
-#include <wx/dialog.h>
 #include <wx/listbook.h>
+#include <wx/statline.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/choice.h>
+#include <wx/propgrid/propgrid.h>
+#include <wx/radiobox.h>
+#include <wx/statbmp.h>
+#include <wx/fontdlg.h>
 //*)

 class Preferences: public wxDialog
@@ -29,100 +29,100 @@ class Preferences: public wxDialog
 		virtual ~Preferences();

 		//(*Declarations(Preferences)
-		wxStaticText* StaticText10;
-		wxRadioButton* externalCodeEditorCheck;
-		wxButton* eventsEditorFontBt;
-		wxPanel* InactifColorPnl;
-		wxStaticText* StaticText22;
-		wxButton* OkBt;
-		wxStaticText* StaticText9;
-		wxStaticText* StaticText20;
-		wxPanel* backColorPnl;
-		wxPanel* Panel5;
-		wxCheckBox* hideLabelsCheck;
-		wxCheckBox* avertOnSaveCheck;
-		wxCheckBox* MAJCheck;
-		wxRadioBox* ribbonStyleBox;
 		wxButton* gdStyleBt;
-		wxButton* BrowseDossierTempBt;
-		wxTextCtrl* newProjectFolderEdit;
-		wxTextCtrl* codeEditorEdit;
-		wxButton* oxygenStyleBt;
-		wxStaticText* StaticText13;
-		wxPanel* ActifColor2Pnl;
-		wxStaticText* StaticText2;
-		wxPanel* Panel4;
-		wxChoice* sceneEventsTabPosition;
-		wxStaticText* StaticText14;
-		wxCheckBox* logCheck;
-		wxCheckBox* deleteTemporariesCheck;
-		wxButton* Button1;
-		wxStaticText* StaticText6;
-		wxPanel* activeTabColorPnl;
-		wxPanel* borderColorPnl;
-		wxSpinCtrl* codeCompilerThreadEdit;
-		wxStaticText* StaticText19;
-		wxStaticText* StaticText8;
-		wxPanel* toolbarColorPanel;
-		wxStaticText* StaticText11;
-		wxStaticText* StaticText18;
-		wxTextCtrl* autosaveTimeEdit;
-		wxPanel* Panel8;
-		wxPanel* tabColorPnl;
-		wxTextCtrl* eventsCompilerTempDirEdit;
-		wxFontDialog* eventsEditorFontDialog;
+		wxStaticText* StaticText24;
+		wxButton* newProjectFolderBrowseBt;
+		wxStaticText* StaticText22;
+		wxButton* AideBt;
+		wxPanel* ActifColorPnl;
+		wxPanel* Panel6;
 		wxPanel* Panel1;
-		wxTextCtrl* conditionsColumnWidthEdit;
+		wxButton* browseCompilationTempDir;
+		wxStaticText* StaticText21;
+		wxStaticText* StaticText13;
+		wxStaticText* StaticText14;
+		wxPanel* Panel7;
+		wxRadioButton* internalCodeEditorCheck;
+		wxStaticText* StaticText15;
+		wxChoice* sceneEventsTabPosition;
+		wxStaticLine* StaticLine2;
+		wxCheckBox* hideLabelsCheck;
+		wxChoice* langChoice;
+		wxStaticText* StaticText17;
+		wxButton* oxygenStyleBt;
+		wxButton* BrowseDossierTempBt;
+		wxFontDialog* eventsEditorFontDialog;
+		wxPanel* ActifColor2Pnl;
+		wxPanel* inactiveTextColorPnl;
+		wxRadioBox* tabBox;
+		wxCheckBox* autosaveActivatedCheck;
+		wxButton* Button1;
+		wxButton* Button2;
+		wxTextCtrl* autosaveTimeEdit;
 		wxPanel* activeTextColorPnl;
+		wxPanel* activeTabColorPnl;
+		wxPanel* Panel8;
+		wxStaticText* StaticText20;
+		wxStaticText* StaticText18;
+		wxCheckBox* hideContextPanelsLabels;
 		wxStaticText* StaticText1;
+		wxStaticText* StaticText10;
+		wxTextCtrl* newProjectFolderEdit;
+		wxStaticText* StaticText16;
+		wxPanel* ribbonColor2Pnl;
+		wxPanel* Panel2;
+		wxCheckBox* deleteTemporariesCheck;
+		wxTextCtrl* DossierTempCompEdit;
+		wxCheckBox* MAJCheck;
+		wxSpinCtrl* codeCompilerThreadEdit;
 		wxStaticText* StaticText3;
 		wxTextCtrl* EditeurImageEdit;
-		wxPanel* inactiveTextColorPnl;
-		wxButton* browseJavaBt;
-		wxButton* newProjectFolderBrowseBt;
-		wxButton* Button2;
-		wxPanel* InactifColor2Pnl;
-		wxCheckBox* hidePageTabsCheck;
-		wxPanel* Panel6;
-		wxPanel* Panel3;
-		wxStaticText* StaticText21;
-		wxStaticLine* StaticLine2;
+		wxPanel* Panel4;
 		wxStaticText* StaticText23;
-		wxStaticText* StaticText24;
 		wxCheckBox* customToolbarColorCheck;
-		wxRadioBox* tabBox;
-		wxPanel* ActifColorPnl;
-		wxCheckBox* sendInfoCheck;
-		wxCheckBox* hideContextPanelsLabels;
+		wxStaticLine* StaticLine1;
+		wxPanel* Panel5;
+		wxStaticText* StaticText8;
+		wxStaticText* StaticText12;
+		wxButton* officeStyleBt;
+		wxTextCtrl* conditionsColumnWidthEdit;
+		wxButton* AnnulerBt;
+		wxPanel* Panel3;
+		wxStaticText* StaticText7;
+		wxTextCtrl* codeEditorEdit;
+		wxPanel* borderColorPnl;
+		wxPanel* InactifColorPnl;
+		wxRadioBox* ribbonStyleBox;
+		wxTextCtrl* eventsCompilerTempDirEdit;
+		wxCheckBox* logCheck;
+		wxTextCtrl* javaDirEdit;
+		wxStaticText* StaticText4;
+		wxPanel* toolbarColorPanel;
+		wxStaticText* StaticText5;
+		wxButton* eventsEditorFontBt;
+		wxStaticText* StaticText2;
+		wxStaticBitmap* StaticBitmap3;
+		wxCheckBox* avertOnSaveCheck;
+		wxButton* OkBt;
+		wxPanel* fileBtColorPnl;
+		wxStaticText* StaticText6;
+		wxCheckBox* hidePageTabsCheck;
+		wxPanel* backColorPnl;
+		wxButton* browseJavaBt;
+		wxPanel* ribbonColor1Pnl;
+		wxButton* radianceStyleBt;
+		wxStaticText* StaticText19;
+		wxButton* BrowseEditionImage;
+		wxRadioButton* externalCodeEditorCheck;
+		wxPanel* tabColorPnl;
+		wxStaticText* StaticText9;
+		wxRadioBox* toolbarBox;
+		wxPanel* InactifColor2Pnl;
+		wxButton* browseCodeEditorBt;
 		wxPropertyGrid* eventsEditorParametersProperties;
 		wxListbook* Listbook1;
-		wxStaticText* StaticText5;
-		wxStaticText* StaticText7;
-		wxPanel* Panel7;
-		wxPanel* fileBtColorPnl;
-		wxCheckBox* autosaveActivatedCheck;
-		wxStaticLine* StaticLine1;
-		wxButton* BrowseEditionImage;
-		wxTextCtrl* javaDirEdit;
-		wxStaticText* StaticText15;
-		wxStaticText* StaticText12;
-		wxButton* AnnulerBt;
-		wxPanel* Panel2;
-		wxChoice* langChoice;
-		wxButton* radianceStyleBt;
-		wxTextCtrl* DossierTempCompEdit;
-		wxPanel* ribbonColor1Pnl;
-		wxPanel* ribbonColor2Pnl;
-		wxStaticText* StaticText17;
-		wxStaticText* StaticText4;
-		wxButton* browseCodeEditorBt;
-		wxRadioBox* toolbarBox;
-		wxButton* browseCompilationTempDir;
-		wxButton* officeStyleBt;
-		wxStaticText* StaticText16;
-		wxStaticBitmap* StaticBitmap3;
-		wxRadioButton* internalCodeEditorCheck;
-		wxButton* AideBt;
+		wxStaticText* StaticText11;
+		wxCheckBox* sendInfoCheck;
 		//*)

 	protected:
--- a/IDE/wxsmith/Preferences.wxs
+++ b/IDE/wxsmith/Preferences.wxs
@@ -115,7 +115,6 @@
 														<object class="sizeritem">
 															<object class="wxTextCtrl" name="ID_TEXTCTRL1" variable="autosaveTimeEdit" member="yes">
 																<value>3</value>
-																<size>44,21</size>
 															</object>
 															<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 															<border>5</border>
@@ -195,6 +194,10 @@
 								</object>
 								<object class="sizeritem">
 									<object class="wxChoice" name="ID_CHOICE2" variable="langChoice" member="yes">
+										<content>
+											<item>English</item>
+										</content>
+										<selection>0</selection>
 										<handler function="OnlangChoiceSelect" entry="EVT_CHOICE" />
 									</object>
 									<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
@@ -1017,9 +1020,7 @@
 											<option>1</option>
 										</object>
 										<object class="sizeritem">
-											<object class="wxTextCtrl" name="ID_TEXTCTRL5" variable="conditionsColumnWidthEdit" member="yes">
-												<size>65,21</size>
-											</object>
+											<object class="wxTextCtrl" name="ID_TEXTCTRL5" variable="conditionsColumnWidthEdit" member="yes" />
 											<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 											<border>5</border>
 											<option>1</option>
@@ -1232,7 +1233,6 @@
 			</object>
 		</object>
 		<object class="wxFontDialog" variable="eventsEditorFontDialog" member="yes">
-			<allow_symbols>0</allow_symbols>
 			<enable_effects>0</enable_effects>
 		</object>
 	</object>