Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix initial size of the font sample main window

Browse Source 
Don't hard code main frame size in pixels, this is simple but wrong.
This commit is contained in:
Vadim Zeitlin
2018-09-11 15:36:01 +02:00
parent a79bbf7348
commit cfa37fefae
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/font/font.cpp
View File

@@ -141,7 +141,7 @@ public:
protected: protected:
virtual wxSize DoGetBestClientSize() const wxOVERRIDE virtual wxSize DoGetBestClientSize() const wxOVERRIDE
{ {
return wxSize(60*GetCharWidth(), 15*GetCharHeight()); return wxSize(80*GetCharWidth(), 15*GetCharHeight());
} }
private: private:
@@ -172,7 +172,7 @@ class MyFrame : public wxFrame
{ {
public: public:
// ctor(s) // ctor(s)
MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); MyFrame();
// event handlers (these functions should _not_ be virtual) // event handlers (these functions should _not_ be virtual)
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
@@ -374,8 +374,7 @@ bool MyApp::OnInit()
wxString privfont = argv[0].BeforeLast('/'); wxString privfont = argv[0].BeforeLast('/');
// Create the main application window // Create the main application window
MyFrame *frame = new MyFrame(wxT("Font wxWidgets demo"), MyFrame *frame = new MyFrame();
wxPoint(50, 50), wxSize(600, 400));
// Show it // Show it
frame->Show(true); frame->Show(true);
@@ -391,8 +390,8 @@ bool MyApp::OnInit()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// frame constructor // frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) MyFrame::MyFrame()
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size), m_textctrl(NULL) : wxFrame(NULL, wxID_ANY, "wxWidgets font sample")
{ {
SetIcon(wxICON(sample)); SetIcon(wxICON(sample));
@@ -532,13 +531,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
wxSize(-1, 6*GetCharHeight()), wxSize(-1, 6*GetCharHeight()),
wxTE_MULTILINE); wxTE_MULTILINE);
splitter->SplitHorizontally(m_fontWindow, m_textctrl, m_fontWindow->GetBestSize().y); splitter->SplitHorizontally(m_fontWindow, m_textctrl, 0);
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// create a status bar just for fun (by default with 1 pane only) // create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(); CreateStatusBar();
SetStatusText(wxT("Welcome to wxWidgets font demo!")); SetStatusText(wxT("Welcome to wxWidgets font demo!"));
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
SetClientSize(splitter->GetBestSize());
splitter->SetSashPosition(m_fontWindow->GetBestSize().y);
} }
// -------------------------------------------------------- // --------------------------------------------------------