Remove some redudant declaration in Main file and fix toolbar styling
This commit is contained in:
parent
f7f45ade77
commit
ccb3de679a
@ -8,31 +8,24 @@
|
||||
#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;
|
||||
|
||||
/**
|
||||
* Class with main method
|
||||
*/
|
||||
class TyroApp : public wxApp
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* Start the event loop and create the main window
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
bool TyroApp::OnInit()
|
||||
{
|
||||
bool OnInit()
|
||||
{
|
||||
this->SetAppName(APP_NAME);
|
||||
this->SetVendorName(APP_VENDOR);
|
||||
|
||||
@ -47,17 +40,20 @@ bool TyroApp::OnInit()
|
||||
main_frame->Show(true);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Exit handler
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
int TyroApp::OnExit()
|
||||
{
|
||||
int OnExit()
|
||||
{
|
||||
// Deallocate config object
|
||||
delete wxConfigBase::Set((wxConfigBase *) NULL);
|
||||
|
||||
return close(true);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
IMPLEMENT_APP(TyroApp);
|
||||
|
@ -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");
|
||||
|
Loading…
Reference in New Issue
Block a user