From: <ral...@us...> - 2014-02-28 05:43:15
|
Revision: 9298 http://sourceforge.net/p/planeshift/code/9298 Author: ralphcampbell Date: 2014-02-28 05:43:11 +0000 (Fri, 28 Feb 2014) Log Message: ----------- Initialize MenuBar pointer so we don't crash Modified Paths: -------------- trunk/src/client/gui/shortcutwindow.cpp Modified: trunk/src/client/gui/shortcutwindow.cpp =================================================================== --- trunk/src/client/gui/shortcutwindow.cpp 2014-02-25 19:18:40 UTC (rev 9297) +++ trunk/src/client/gui/shortcutwindow.cpp 2014-02-28 05:43:11 UTC (rev 9298) @@ -55,6 +55,7 @@ //============================================================================= pawsShortcutWindow::pawsShortcutWindow() : + MenuBar(NULL), textBox(NULL), labelBox(NULL), shortcutText(NULL), @@ -809,6 +810,7 @@ fileName = FN; SaveCommands(); } + void pawsShortcutWindow::SaveCommands() { bool found = false; @@ -863,7 +865,6 @@ doc->Write(vfs, fileName.GetData() ); } - void pawsShortcutWindow::ExecuteCommand(int shortcutNum ) { @@ -956,7 +957,6 @@ } } - const csString& pawsShortcutWindow::GetCommandName(int shortcutNum ) { if (shortcutNum < 0 || shortcutNum >= NUM_SHORTCUTS) @@ -975,7 +975,6 @@ return names[shortcutNum]; } - bool pawsShortcutWindow::OnFingering(csString string, psControl::Device device, uint button, uint32 mods) { pawsFingeringWindow* fingWnd = dynamic_cast<pawsFingeringWindow*>(PawsManager::GetSingleton().FindWidget("FingeringWindow")); @@ -1023,7 +1022,6 @@ } } - void pawsShortcutWindow::Show() { psStatDRMessage msg; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |