-1->wxID_ANY, TRUE->true and FALSE->false replacements.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index bcc1dd71c5d44f943261733c6833af5b77212555..3e99d2349606ce3f17033ba9b5ac82a679ec5de9 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -50,7 +50,7 @@ bool MyApp::OnInit()
     if (!stick.IsOk())
     {
         wxMessageBox(_T("No joystick detected!"));
     if (!stick.IsOk())
     {
         wxMessageBox(_T("No joystick detected!"));

-        return FALSE;
+        return false;

     }
 
 #if wxUSE_SOUND
     }
 
 #if wxUSE_SOUND


@@ -90,11 +90,11 @@ bool MyApp::OnInit()
     frame->CreateStatusBar();
 
     frame->CenterOnScreen();
     frame->CreateStatusBar();
 
     frame->CenterOnScreen();

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

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 

-    return TRUE;
+    return true;

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


@@ -103,7 +103,7 @@ END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
 
 // 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, wxID_ANY, pos, size, wxSUNKEN_BORDER)

 {
     m_stick = new wxJoystick(wxJOYSTICK1);
     m_stick->SetCapture(this, 10);
 {
     m_stick = new wxJoystick(wxJOYSTICK1);
     m_stick->SetCapture(this, 10);


@@ -129,12 +129,10 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
     if (xmin < 0) {
         xmax += abs(xmin);
         pt.x += abs(xmin);
     if (xmin < 0) {
         xmax += abs(xmin);
         pt.x += abs(xmin);

-        xmin = 0;

     }
     if (ymin < 0) {
         ymax += abs(ymin);
         pt.y += abs(ymin);
     }
     if (ymin < 0) {
         ymax += abs(ymin);
         pt.y += abs(ymin);

-        ymin = 0;

     }
     
     // Scale to canvas size
     }
     
     // Scale to canvas size


@@ -175,7 +173,7 @@ END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos,
     const wxSize& size, const long style)
 
 MyFrame::MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos,
     const wxSize& size, const long style)

-    : wxFrame(parent, -1, title, pos, size, style)
+    : wxFrame(parent, wxID_ANY, title, pos, size, style)

 {
     canvas = new MyCanvas(this);
 }
 {
     canvas = new MyCanvas(this);
 }


@@ -187,7 +185,7 @@ MyFrame::~MyFrame()
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

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

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