Fix for [ 748805 ] Assert failure for specified situation in samples/controls

[wxWidgets.git] / samples / joytest / joytest.cpp

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 5fe4889958db32518ad4894c89d9744b7e2af64b..349e104c8f6f864c664c7db263cf8a9f1cdc385e 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -20,8 +20,16 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include <wx/wave.h>
-#include <wx/joystick.h>
+#if !wxUSE_JOYSTICK
+#   error You must set wxUSE_JOYSTICK to 1 in setup.h
+#endif
+
+#if !wxUSE_STATUSBAR
+#   error You must set wxUSE_STATUSBAR to 1 in setup.h
+#endif
+
+#include "wx/wave.h"
+#include "wx/joystick.h"

 
 #include "joytest.h"
 
 
 #include "joytest.h"
 


@@ -36,72 +44,70 @@ long ypos = -1;
 int winNumber = 1;
 
 // Initialise this in OnInit, not statically
 int winNumber = 1;
 
 // Initialise this in OnInit, not statically

-bool MyApp::OnInit(void)
+bool MyApp::OnInit()

 {
 {

-  wxJoystick stick(wxJOYSTICK1);
-  if (!stick.IsOk())
-  {
-    wxMessageBox("No joystick detected!");
-    return FALSE;
-  }
+    wxJoystick stick(wxJOYSTICK1);
+    if (!stick.IsOk())
+    {
+        wxMessageBox(_T("No joystick detected!"));
+        return FALSE;
+    }
+

 #if wxUSE_WAVE
 #if wxUSE_WAVE

-  m_fire.Create("gun.wav");
+    m_fire.Create(_T("gun.wav"));

 #endif // wxUSE_WAVE
 
 #endif // wxUSE_WAVE
 

-  m_maxX = stick.GetXMax();
-  m_maxY = stick.GetYMax();
+    m_maxX = stick.GetXMax();
+    m_maxY = stick.GetYMax();

 
 

-  // Create the main frame window
+    // Create the main frame window

 
 

-  frame = new MyFrame(NULL, "Joystick Demo", wxPoint(0, 0), wxSize(500, 400),
-   wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
+    frame = new MyFrame(NULL, _T("Joystick Demo"), wxDefaultPosition,
+        wxSize(500, 400), wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);

 
   // Give it an icon (this is ignored in MDI mode: uses resources)
 #ifdef __WXMSW__
 
   // Give it an icon (this is ignored in MDI mode: uses resources)
 #ifdef __WXMSW__

-  frame->SetIcon(wxIcon("joyicon"));
+    frame->SetIcon(wxIcon(_T("joyicon")));

 #endif
 #ifdef __X__
 #endif
 #ifdef __X__

-  frame->SetIcon(wxIcon("joyicon.xbm"));
+    frame->SetIcon(wxIcon(_T("joyicon.xbm")));

 #endif
 
 #endif
 

-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
-
-  file_menu->Append(JOYTEST_QUIT, "&Exit");
+    // Make a menubar
+    wxMenu *file_menu = new wxMenu;

 
 

-  wxMenu *help_menu = new wxMenu;
-  help_menu->Append(JOYTEST_ABOUT, "&About");
+    file_menu->Append(JOYTEST_QUIT, _T("&Exit"));

 
 

-  wxMenuBar *menu_bar = new wxMenuBar;
+    wxMenuBar *menu_bar = new wxMenuBar;

 
 

-  menu_bar->Append(file_menu, "&File");
-  menu_bar->Append(help_menu, "&Help");
+    menu_bar->Append(file_menu, _T("&File"));

 
 

-  // Associate the menu bar with the frame
-  frame->SetMenuBar(menu_bar);
+    // Associate the menu bar with the frame
+    frame->SetMenuBar(menu_bar);

 
 

-  frame->CreateStatusBar();
+    frame->CreateStatusBar();

 
 

-  frame->Show(TRUE);
+    frame->CenterOnScreen();
+    frame->Show(TRUE);

 
 

-  SetTopWindow(frame);
+    SetTopWindow(frame);

 
 

-  return TRUE;
+    return TRUE;

 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)

-       EVT_JOYSTICK_EVENTS(MyCanvas::OnJoystickEvent)
+    EVT_JOYSTICK_EVENTS(MyCanvas::OnJoystickEvent)

 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):

- wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER)
+    wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER)

 {
     wxJoystick joystick(wxJOYSTICK1);
     joystick.SetCapture(this);
 }
 
 {
     wxJoystick joystick(wxJOYSTICK1);
     joystick.SetCapture(this);
 }
 

-MyCanvas::~MyCanvas(void)
+MyCanvas::~MyCanvas()

 {
     wxJoystick joystick(wxJOYSTICK1);
     joystick.ReleaseCapture();
 {
     wxJoystick joystick(wxJOYSTICK1);
     joystick.ReleaseCapture();


@@ -109,62 +115,65 @@ MyCanvas::~MyCanvas(void)
 
 void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 {
 
 void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 {

-  wxClientDC dc(this);
+    wxClientDC dc(this);
+
+    wxPoint pt(event.GetPosition());
+
+    // Scale to canvas size
+    int cw, ch;
+    GetSize(&cw, &ch);

 
 

-  wxPoint pt(event.GetPosition());
+    pt.x = (long) (((double)pt.x/(double)wxGetApp().m_maxX) * cw);
+    pt.y = (long) (((double)pt.y/(double)wxGetApp().m_maxY) * ch);

 
 

-  // Scale to canvas size
-  int cw, ch;
-  GetSize(&cw, &ch);
+    if (xpos > -1 && ypos > -1 && event.IsMove() && event.ButtonIsDown())
+    {
+        dc.SetPen(*wxBLACK_PEN);
+        dc.DrawLine(xpos, ypos, pt.x, pt.y);
+    }

 
 

-  pt.x = (long) (((double)pt.x/(double)wxGetApp().m_maxX) * cw);
-  pt.y = (long) (((double)pt.y/(double)wxGetApp().m_maxY) * ch);
+    xpos = pt.x;
+    ypos = pt.y;

 
 

-  if (xpos > -1 && ypos > -1 && event.IsMove() && event.ButtonIsDown())
-  {
-    dc.SetPen(*wxBLACK_PEN);
-    dc.DrawLine(xpos, ypos, pt.x, pt.y);
-  }
-  xpos = pt.x;
-  ypos = pt.y;
+    wxString buf;
+    if (event.ButtonDown())
+        buf.Printf(_T("Joystick (%d, %d) Fire!"), pt.x, pt.y);
+    else
+        buf.Printf(_T("Joystick (%d, %d)"), pt.x, pt.y);

 
 

-  char buf[100];
-  if (event.ButtonDown())
-    sprintf(buf, "Joystick (%d, %d) Fire!", pt.x, pt.y);
-  else
-    sprintf(buf, "Joystick (%d, %d)", pt.x, pt.y);
-  frame->SetStatusText(buf);
+    frame->SetStatusText(buf);

 
 #if wxUSE_WAVE
 
 #if wxUSE_WAVE

-  if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
-  {
-    wxGetApp().m_fire.Play();
-  }
+    if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
+    {
+        wxGetApp().m_fire.Play();
+    }

 #endif // wxUSE_WAVE
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #endif // wxUSE_WAVE
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-  EVT_MENU(JOYTEST_QUIT, MyFrame::OnQuit)
+    EVT_MENU(JOYTEST_QUIT, MyFrame::OnQuit)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size,
-const long style):
-  wxFrame(parent, -1, title, pos, size, style)
+MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos,
+    const wxSize& size, const long style)
+    : wxFrame(parent, -1, title, pos, size, style)

 {
 {

-  canvas = new MyCanvas(this);
+    canvas = new MyCanvas(this);

 }
 
 }
 

-MyFrame::~MyFrame(void)
+MyFrame::~MyFrame()

 {
 {

+    // Empty

 }
 
 void MyFrame::OnQuit(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnQuit(wxCommandEvent& event)
 {

-      Close(TRUE);
+    Close(TRUE);

 }
 
 void MyFrame::OnActivate(wxActivateEvent& event)
 {
 }
 
 void MyFrame::OnActivate(wxActivateEvent& event)
 {

-  if (event.GetActive() && canvas)
-    canvas->SetFocus();
+    if (event.GetActive() && canvas)
+        canvas->SetFocus();

 }
 }