Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-02-06 08:48:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

- mainframe.cc

Browse source 
correct OnTextEnter event for Rack
This commit is contained in:
Antoine Fraboulet 2006-01-01 19:33:51 +00:00
parent 30d6cc0687
commit 9e591c5845
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
wxwin/mainframe.cc
View file

@ -142,10 +142,11 @@ BEGIN_EVENT_TABLE(MainFrame, wxFrame)
EVT_BUTTON(Button_Search, MainFrame::OnSearch) EVT_BUTTON(Button_Search, MainFrame::OnSearch)
EVT_BUTTON(Button_PlayBack, MainFrame::OnPlay) EVT_BUTTON(Button_PlayBack, MainFrame::OnPlay)
// //
EVT_TEXT_ENTER(Rack_ID, MainFrame::OnSearch) EVT_TEXT_ENTER(Rack_ID, MainFrame::OnTextEnter)
// //
EVT_CLOSE(MainFrame::OnCloseWindow) EVT_CLOSE(MainFrame::OnCloseWindow)
// //
//EVT_MENU(Menu_Help, MainFrame::OnMenuHelp)
END_EVENT_TABLE() END_EVENT_TABLE()
// ****************************** // ******************************
@ -413,7 +414,7 @@ MainFrame::OnMenuGameOpen(wxCommandEvent&)
FILE* fin; FILE* fin;
if ((fin = fopen(dialog.GetPath().mb_str(), "r")) == NULL) if ((fin = fopen(dialog.GetPath().mb_str(), "rb")) == NULL)
{ {
txt << wxT("Impossible d'ouvrir") << dialog.GetPath(); txt << wxT("Impossible d'ouvrir") << dialog.GetPath();
wxMessageDialog msg(this, txt, wxT("Ouverture d'une partie")); wxMessageDialog msg(this, txt, wxT("Ouverture d'une partie"));
@ -433,8 +434,6 @@ MainFrame::OnMenuGameOpen(wxCommandEvent&)
return; return;
} }
#if 0
// FIXME
if (m_game->getHistory().getSize() == 0) if (m_game->getHistory().getSize() == 0)
{ {
wxMessageDialog msg(this, wxMessageDialog msg(this,
@ -443,16 +442,13 @@ MainFrame::OnMenuGameOpen(wxCommandEvent&)
msg.ShowModal(); msg.ShowModal();
return; return;
} }
#endif
std::string r = ""; std::string r = "";
#if 0
// FIXME
if (m_game->getHistory().getSize() >= 0) if (m_game->getHistory().getSize() >= 0)
{ {
r = m_game->getCurrentPlayer().getCurrentRack().toString(); r = m_game->getCurrentPlayer().getCurrentRack().toString();
} }
#endif
rack->SetValue(wxU(r.c_str())); rack->SetValue(wxU(r.c_str()));
// update gfxboard and all frames // update gfxboard and all frames
@ -750,7 +746,7 @@ MainFrame::OnMenuQuitApropos(wxCommandEvent& WXUNUSED(event))
{ {
wxString msg; wxString msg;
// XXX: msg << wxT("Eliot\n© Antoine Fraboulet 1999-2004\n\n"); // XXX: msg << wxT("Eliot\n© Antoine Fraboulet 1999-2004\n\n");
msg << wxT("Eliot\nCopyright Antoine Fraboulet 1999-2004\n\n"); msg << wxT("Eliot\nCopyright Antoine Fraboulet 1999-2006\n\n");
msg << wxT("This program is free software; you can redistribute it and/or modify\n"); msg << wxT("This program is free software; you can redistribute it and/or modify\n");
msg << wxT("it under the terms of the GNU General Public License as published by\n"); msg << wxT("it under the terms of the GNU General Public License as published by\n");
msg << wxT("the Free Software Foundation; either version 2 of the License, or\n"); msg << wxT("the Free Software Foundation; either version 2 of the License, or\n");
@ -774,7 +770,7 @@ void
MainFrame::OnSetRack(wxCommandEvent& event) MainFrame::OnSetRack(wxCommandEvent& event)
{ {
int id; int id;
// TODO Game::set_rack_mode -> PlayedRack::set_rack_mode
Game::set_rack_mode mode = Game::RACK_NEW; Game::set_rack_mode mode = Game::RACK_NEW;
debug("OnSetRack "); debug("OnSetRack ");
switch ((id = event.GetId())) switch ((id = event.GetId()))
@ -800,6 +796,7 @@ MainFrame::OnSetRack(wxCommandEvent& event)
void void
MainFrame::OnSearch(wxCommandEvent& WXUNUSED(event)) MainFrame::OnSearch(wxCommandEvent& WXUNUSED(event))
{ {
debug("MainFrame::OnSearch\n");
Search(); Search();
} }
@ -969,6 +966,7 @@ MainFrame::SetRack(Game::set_rack_mode mode, wxString srack)
wxString msg; wxString msg;
bool check = config.getRackChecking(); bool check = config.getRackChecking();
((Training*)m_game)->removeTestPlay();
str = (const char*)srack.mb_str(); str = (const char*)srack.mb_str();
res = ((Training*)m_game)->setRack(mode, check, str); res = ((Training*)m_game)->setRack(mode, check, str);
@ -1063,4 +1061,5 @@ MainFrame::TestPlay(int n)
/// mode: c++ /// mode: c++
/// mode: hs-minor /// mode: hs-minor
/// c-basic-offset: 4 /// c-basic-offset: 4
/// indent-tabs-mode: nil
/// End: /// End: