Fix centering of top-level children of wxMDIParentFrame on Mac

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

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index bcc1dd71c5d44f943261733c6833af5b77212555..ea875654998ab4a72449858eca9004803c4f569e 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -24,10 +24,6 @@
 #   error You must set wxUSE_JOYSTICK to 1 in setup.h
 #endif
 
 #   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/sound.h"
 #include "wx/joystick.h"
 
 #include "wx/sound.h"
 #include "wx/joystick.h"
 


@@ -50,7 +46,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


@@ -87,14 +83,16 @@ bool MyApp::OnInit()
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

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

+#endif // wxUSE_STATUSBAR

 
     frame->CenterOnScreen();
 
     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 +101,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,14 +127,12 @@ 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
     int cw, ch;
     GetSize(&cw, &ch);
     // Scale to canvas size
     int cw, ch;
     GetSize(&cw, &ch);


@@ -153,6 +149,7 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
     xpos = pt.x;
     ypos = pt.y;
 
     xpos = pt.x;
     ypos = pt.y;
 

+#if wxUSE_STATUSBAR

     wxString buf;
     if (event.ButtonDown())
         buf.Printf(_T("Joystick (%d, %d) Fire!"), pt.x, pt.y);
     wxString buf;
     if (event.ButtonDown())
         buf.Printf(_T("Joystick (%d, %d) Fire!"), pt.x, pt.y);


@@ -160,6 +157,7 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
         buf.Printf(_T("Joystick (%d, %d)"), pt.x, pt.y);
 
     frame->SetStatusText(buf);
         buf.Printf(_T("Joystick (%d, %d)"), pt.x, pt.y);
 
     frame->SetStatusText(buf);

+#endif // wxUSE_STATUSBAR

 
 #if wxUSE_SOUND
     if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
 
 #if wxUSE_SOUND
     if (event.ButtonDown() && wxGetApp().m_fire.IsOk())


@@ -175,19 +173,14 @@ 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);
 }
 

-MyFrame::~MyFrame()
-{
-    // Empty
-}
-

 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)