timw4mail/Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some redudant declaration in Main file and fix toolbar styling

Browse Source
This commit is contained in:
Tim Warren 2015-05-12 14:09:40 -04:00
parent f7f45ade77
commit ccb3de679a
2 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/TyroApp.cpp
View File

@ -8,56 +8,52 @@
#include <wx/app.h>
#include <wx/debug.h>
class TyroApp : public wxApp
{
friend class MainFrame;
public:
virtual bool OnInit();
virtual int OnExit();
private:
};
//**************************************************************
IMPLEMENT_APP(TyroApp);
// Some global stuff
wxConfigBase *Config;
TyroMenu *mbar;
MainFrame *main_frame;
/**
* Start the event loop and create the main window
*
* @return bool
* Class with main method
*/
bool TyroApp::OnInit()
class TyroApp : public wxApp
{
this->SetAppName(APP_NAME);
this->SetVendorName(APP_VENDOR);
public:
/**
* Start the event loop and create the main window
*
* @return bool
*/
bool OnInit()
{
this->SetAppName(APP_NAME);
this->SetVendorName(APP_VENDOR);
Config = wxConfigBase::Get();
mbar = new TyroMenu();
main_frame = new MainFrame(0L, APP_NAME);
Config = wxConfigBase::Get();
mbar = new TyroMenu();
main_frame = new MainFrame(0L, APP_NAME);
SetTopWindow(main_frame);
SetTopWindow(main_frame);
main_frame->Layout();
main_frame->CenterOnScreen();
main_frame->Show(true);
main_frame->Layout();
main_frame->CenterOnScreen();
main_frame->Show(true);
return true;
}
return true;
}
/**
* Exit handler
*
* @return int
*/
int TyroApp::OnExit()
{
// Deallocate config object
delete wxConfigBase::Set((wxConfigBase *) NULL);
/**
* Exit handler
*
* @return int
*/
int OnExit()
{
// Deallocate config object
delete wxConfigBase::Set((wxConfigBase *) NULL);
return close(true);
}
return close(true);
}
};
IMPLEMENT_APP(TyroApp);

10
src/widgets/MainFrame.cpp
View File

@ -58,7 +58,12 @@ void MainFrame::DoLayout()
// Setup properties for each AUI pane
wxAuiPaneInfo toolBarPaneInfo;
toolBarPaneInfo.ToolbarPane().Top();
toolBarPaneInfo
.Top()
.ToolbarPane()
.Gripper(false)
.DockFixed(true)
.Resizable(true);
this->manager->AddPane(toolBar, toolBarPaneInfo);
wxAuiPaneInfo notebookPaneInfo;
@ -133,7 +138,10 @@ void MainFrame::SetupToolbar()
toolBar->AddTool(wxID_NEW, "New", new_file_icon, "New file");
toolBar->AddTool(wxID_OPEN, "Open", open_file_icon, "Open file");
toolBar->AddTool(wxID_SAVE, "Save", save_file_icon, "Save file");
toolBar->AddSeparator();
toolBar->AddTool(wxID_COPY, "Copy", copy_icon, "Copy");
toolBar->AddTool(wxID_CUT, "Cut", cut_icon, "Cut");
toolBar->AddTool(wxID_PASTE, "Paste", paste_icon, "Paste");