diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-12-07 22:12:10 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-12-07 22:40:27 +0100 |
| commit | 9a6b371c96dea8b82d915c2ce2ac7e621d029e0f (patch) | |
| tree | f5e1ce5ffe25ebc6099df4076cfedd7fbb12511d | |
| parent | 078614fbce14aaf820e8ce6389a1c95df30c6542 (diff) | |
| download | VeraCrypt-9a6b371c96dea8b82d915c2ce2ac7e621d029e0f.tar.gz VeraCrypt-9a6b371c96dea8b82d915c2ce2ac7e621d029e0f.zip | |
MacOSX/Linux: Solve truncated text in some Wizard windows by defining a large enough minimum size.VeraCrypt_1.0f-BETA2
| -rw-r--r-- | src/Main/Forms/Forms.cpp | 11 | ||||
| -rw-r--r-- | src/Main/Forms/Forms.h | 1 | ||||
| -rw-r--r-- | src/Main/Forms/TrueCrypt.fbp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp index c927bf50..17333a79 100644 --- a/src/Main/Forms/Forms.cpp +++ b/src/Main/Forms/Forms.cpp @@ -519,10 +519,9 @@ MainFrameBase::~MainFrameBase() WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
{
- this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+ this->SetSizeHints( wxSize( 750,450 ), wxDefaultSize );
- wxBoxSizer* bSizer92;
- bSizer92 = new wxBoxSizer( wxVERTICAL );
+ MainSizer = new wxBoxSizer( wxVERTICAL );
MainPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer63;
@@ -598,12 +597,12 @@ WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxStrin MainPanel->SetSizer( bSizer63 );
MainPanel->Layout();
bSizer63->Fit( MainPanel );
- bSizer92->Add( MainPanel, 1, wxEXPAND, 5 );
+ MainSizer->Add( MainPanel, 1, wxEXPAND, 5 );
- this->SetSizer( bSizer92 );
+ this->SetSizer( MainSizer );
this->Layout();
- bSizer92->Fit( this );
+ MainSizer->Fit( this );
// Connect Events
this->Connect( wxEVT_ACTIVATE, wxActivateEventHandler( WizardFrameBase::OnActivate ) );
diff --git a/src/Main/Forms/Forms.h b/src/Main/Forms/Forms.h index 7c485ee9..60d61b0a 100644 --- a/src/Main/Forms/Forms.h +++ b/src/Main/Forms/Forms.h @@ -161,6 +161,7 @@ namespace VeraCrypt private:
protected:
+ wxBoxSizer* MainSizer;
wxPanel* MainPanel;
wxStaticBitmap* WizardBitmap;
wxStaticText* PageTitleStaticText;
diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp index e297157c..1a173020 100644 --- a/src/Main/Forms/TrueCrypt.fbp +++ b/src/Main/Forms/TrueCrypt.fbp @@ -2403,7 +2403,7 @@ <property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
- <property name="minimum_size"></property>
+ <property name="minimum_size">750,450</property>
<property name="name">WizardFrameBase</property>
<property name="pos"></property>
<property name="size">-1,-1</property>
@@ -2452,9 +2452,9 @@ <event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
- <property name="name">bSizer92</property>
+ <property name="name">MainSizer</property>
<property name="orient">wxVERTICAL</property>
- <property name="permission">none</property>
+ <property name="permission">protected</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
|