diff --git a/wxCrossGen/FormBuilderGUI.fbp b/wxCrossGen/FormBuilderGUI.fbp index 4024f65..1c5d353 100644 --- a/wxCrossGen/FormBuilderGUI.fbp +++ b/wxCrossGen/FormBuilderGUI.fbp @@ -364,6 +364,59 @@ bSizer3 wxHORIZONTAL none + + 5 + wxBOTTOM|wxLEFT|wxRIGHT|wxTOP + 0 + + + + + 1 + + + 1 + wxID_ANY + + + bPreview + protected + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALL|wxEXPAND @@ -423,59 +476,6 @@ - - 5 - wxALL - 0 - - - - - 1 - - - 0 - wxID_ANY - - - bPreview - protected - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wxCrossGen/fbgui/fbgui.cpp b/wxCrossGen/fbgui/fbgui.cpp index 9f00af5..f2ad504 100644 --- a/wxCrossGen/fbgui/fbgui.cpp +++ b/wxCrossGen/fbgui/fbgui.cpp @@ -63,12 +63,14 @@ VMainFrame::VMainFrame( wxWindow* parent, wxWindowID id, const wxString& title, wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxHORIZONTAL ); + bPreview = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + bPreview->Hide(); + + bSizer3->Add( bPreview, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); + tOutput = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_WORDWRAP ); bSizer3->Add( tOutput, 1, wxALL|wxEXPAND, 5 ); - bPreview = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - bSizer3->Add( bPreview, 0, wxALL, 5 ); - bSizer2->Add( bSizer3, 1, wxEXPAND, 5 ); wxBoxSizer* bSizer5; diff --git a/wxCrossGen/fbgui/fbgui.h b/wxCrossGen/fbgui/fbgui.h index 0616bf8..f0ceef2 100644 --- a/wxCrossGen/fbgui/fbgui.h +++ b/wxCrossGen/fbgui/fbgui.h @@ -45,8 +45,8 @@ class VMainFrame : public wxFrame wxMenu* miHelp; wxTextCtrl* tPath; wxButton* bPath; - wxTextCtrl* tOutput; wxStaticBitmap* bPreview; + wxTextCtrl* tOutput; wxButton* bGenerate; diff --git a/wxCrossGen/main.cpp b/wxCrossGen/main.cpp index d532376..d532f89 100644 --- a/wxCrossGen/main.cpp +++ b/wxCrossGen/main.cpp @@ -112,6 +112,7 @@ void MainFrame::SetGridImage(GridType &grid, size_t w) { } bPreview->SetBitmap(bmp); + bPreview->Show(); dc.SelectObject( wxNullBitmap );