Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for cube sample from Paul Thiessen

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-10 16:37:33 +00:00
parent 00b2a97f34
commit ec2995088d
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/opengl/cube/cube.cpp
View File

@@ -365,10 +365,7 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
unsigned long currTime = event.m_timeStamp - m_xsynct; unsigned long currTime = event.m_timeStamp - m_xsynct;
// we have to test for m_Key != 0 because otherwise the test would be if (evkey != m_Key)
// always true because it is set to 0 in OnKeyUp() below - I don't know
// why is it like this, just fixing blindly (VZ)
if (evkey != m_Key && m_Key != 0)
{ {
m_Key = evkey; m_Key = evkey;
m_LastRedraw = m_StartTime = m_LastTime = currTime; m_LastRedraw = m_StartTime = m_LastTime = currTime;
@@ -430,7 +427,7 @@ void MyFrame::OnExit(wxCommandEvent& event)
Destroy(); Destroy();
} }
void MyFrame::OnNewWindow() void MyFrame::OnNewWindow(wxCommandEvent& event)
{ {
MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo Clone", MyFrame *frame = new MyFrame(NULL, "Cube OpenGL Demo Clone",
wxPoint(50, 50), wxSize(400, 300)); wxPoint(50, 50), wxSize(400, 300));
@@ -461,7 +458,7 @@ void MyFrame::OnNewWindow()
frame->Show(TRUE); frame->Show(TRUE);
} }
void MyFrame::OnDefRotateLeftKey() void MyFrame::OnDefRotateLeftKey(wxCommandEvent& event)
{ {
ScanCodeDialog dial( this, -1, m_canvas->m_rleft, ScanCodeDialog dial( this, -1, m_canvas->m_rleft,
wxString("Left"), "Define key" ); wxString("Left"), "Define key" );
@@ -469,7 +466,7 @@ void MyFrame::OnDefRotateLeftKey()
if( result == wxID_OK ) if( result == wxID_OK )
m_canvas->m_rleft = dial.GetValue(); m_canvas->m_rleft = dial.GetValue();
} }
void MyFrame::OnDefRotateRightKey() void MyFrame::OnDefRotateRightKey(wxCommandEvent& event)
{ {
ScanCodeDialog dial( this, -1, m_canvas->m_rright, ScanCodeDialog dial( this, -1, m_canvas->m_rright,
wxString("Right"), "Define key" ); wxString("Right"), "Define key" );

6
samples/opengl/cube/cube.h
View File

@@ -30,9 +30,9 @@ public:
const wxSize& size, long style = wxDEFAULT_FRAME_STYLE); const wxSize& size, long style = wxDEFAULT_FRAME_STYLE);
void OnExit(wxCommandEvent& event); void OnExit(wxCommandEvent& event);
void OnNewWindow(); void OnNewWindow(wxCommandEvent& event);
void OnDefRotateLeftKey(); void OnDefRotateLeftKey(wxCommandEvent& event);
void OnDefRotateRightKey(); void OnDefRotateRightKey(wxCommandEvent& event);
public: public:
TestGLCanvas* m_canvas; TestGLCanvas* m_canvas;