GTK GUI :

- Fixed wrong sigc types
- Fixed loading of GB games
This commit is contained in:
bgk 2008-04-21 06:28:02 +00:00
parent caf0e8fced
commit e46f9535ac
4 changed files with 1196 additions and 109 deletions

1300
Makefile

File diff suppressed because it is too large Load Diff

View File

@ -62,7 +62,7 @@ private:
bool m_bShowCursor; bool m_bShowCursor;
Gdk::Cursor * m_poEmptyCursor; Gdk::Cursor * m_poEmptyCursor;
SigC::Connection m_oCursorSig; sigc::connection m_oCursorSig;
void vUpdateSize(); void vUpdateSize();
void vStartCursorTimeout(); void vStartCursorTimeout();

View File

@ -1384,6 +1384,7 @@ bool Window::bLoadROM(const std::string & _rsFile)
{ {
m_eCartridge = CartridgeGB; m_eCartridge = CartridgeGB;
m_stEmulator = GBSystem; m_stEmulator = GBSystem;
gbReset();
} }
} }
else if (eType == IMAGE_GBA) else if (eType == IMAGE_GBA)

View File

@ -256,7 +256,7 @@ private:
Gtk::Tooltips m_oTooltips; Gtk::Tooltips m_oTooltips;
SigC::Connection m_oEmuSig; sigc::connection m_oEmuSig;
std::vector<JoypadConfig> m_oJoypads; std::vector<JoypadConfig> m_oJoypads;
Keymap * m_poKeymap; Keymap * m_poKeymap;