mirror of
				https://github.com/davidgiven/fluxengine.git
				synced 2025-10-24 11:11:02 -07:00 
			
		
		
		
	Try to make OSX happy.
This commit is contained in:
		| @@ -12,7 +12,7 @@ | ||||
| MainWindowGen::MainWindowGen( 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->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVECAPTION ) ); | ||||
| 	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); | ||||
|  | ||||
| 	menuBar = new wxMenuBar( 0 ); | ||||
| 	m_menu1 = new wxMenu(); | ||||
| @@ -173,7 +173,7 @@ MainWindowGen::MainWindowGen( wxWindow* parent, wxWindowID id, const wxString& t | ||||
| 	readButton->SetBitmap( wxArtProvider::GetBitmap( wxART_FILE_OPEN, wxART_TOOLBAR ) ); | ||||
| 	readButton->SetToolTip( wxT("Read and decode, producing a disk image from a real disk or flux file.") ); | ||||
|  | ||||
| 	gSizer9->Add( readButton, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); | ||||
| 	gSizer9->Add( readButton, 0, wxALL|wxEXPAND, 5 ); | ||||
|  | ||||
| 	writeButton = new wxButton( idlePanel, wxID_ANY, wxT("Write disk"), wxDefaultPosition, wxDefaultSize, 0 ); | ||||
|  | ||||
| @@ -181,7 +181,7 @@ MainWindowGen::MainWindowGen( wxWindow* parent, wxWindowID id, const wxString& t | ||||
| 	writeButton->SetBitmapDisabled( wxNullBitmap ); | ||||
| 	writeButton->SetToolTip( wxT("Encode and write to either a real disk or a flux file.") ); | ||||
|  | ||||
| 	gSizer9->Add( writeButton, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); | ||||
| 	gSizer9->Add( writeButton, 0, wxALL|wxEXPAND, 5 ); | ||||
|  | ||||
| 	browseButton = new wxButton( idlePanel, wxID_ANY, wxT("Browse disk"), wxDefaultPosition, wxDefaultSize, 0 ); | ||||
|  | ||||
| @@ -189,7 +189,7 @@ MainWindowGen::MainWindowGen( wxWindow* parent, wxWindowID id, const wxString& t | ||||
| 	browseButton->Enable( false ); | ||||
| 	browseButton->SetToolTip( wxT("Access the files on the disk directly without needing to image it.") ); | ||||
|  | ||||
| 	gSizer9->Add( browseButton, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); | ||||
| 	gSizer9->Add( browseButton, 0, wxALL|wxEXPAND, 5 ); | ||||
|  | ||||
|  | ||||
| 	fgSizer8->Add( gSizer9, 1, wxEXPAND, 5 ); | ||||
|   | ||||
| @@ -32,7 +32,7 @@ | ||||
|         <object class="Frame" expanded="1"> | ||||
|             <property name="aui_managed">0</property> | ||||
|             <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> | ||||
|             <property name="bg">wxSYS_COLOUR_INACTIVECAPTION</property> | ||||
|             <property name="bg">wxSYS_COLOUR_WINDOW</property> | ||||
|             <property name="center">wxBOTH</property> | ||||
|             <property name="context_help"></property> | ||||
|             <property name="context_menu">1</property> | ||||
| @@ -1410,7 +1410,7 @@ | ||||
|                                                     <property name="vgap">0</property> | ||||
|                                                     <object class="sizeritem" expanded="0"> | ||||
|                                                         <property name="border">5</property> | ||||
|                                                         <property name="flag">wxALIGN_CENTER|wxALL|wxEXPAND</property> | ||||
|                                                         <property name="flag">wxALL|wxEXPAND</property> | ||||
|                                                         <property name="proportion">0</property> | ||||
|                                                         <object class="wxButton" expanded="0"> | ||||
|                                                             <property name="BottomDockable">1</property> | ||||
| @@ -1484,7 +1484,7 @@ | ||||
|                                                     </object> | ||||
|                                                     <object class="sizeritem" expanded="0"> | ||||
|                                                         <property name="border">5</property> | ||||
|                                                         <property name="flag">wxALIGN_CENTER|wxALL|wxEXPAND</property> | ||||
|                                                         <property name="flag">wxALL|wxEXPAND</property> | ||||
|                                                         <property name="proportion">0</property> | ||||
|                                                         <object class="wxButton" expanded="0"> | ||||
|                                                             <property name="BottomDockable">1</property> | ||||
| @@ -1558,7 +1558,7 @@ | ||||
|                                                     </object> | ||||
|                                                     <object class="sizeritem" expanded="0"> | ||||
|                                                         <property name="border">5</property> | ||||
|                                                         <property name="flag">wxALIGN_CENTER|wxALL|wxEXPAND</property> | ||||
|                                                         <property name="flag">wxALL|wxEXPAND</property> | ||||
|                                                         <property name="proportion">0</property> | ||||
|                                                         <object class="wxButton" expanded="0"> | ||||
|                                                             <property name="BottomDockable">1</property> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user