X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..3c31306c74e878e6888b6c73a44a337516717d73:/src/mgl/window.cpp

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 3d526a5c99..55810916b4 100644
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -27,7 +27,6 @@
     #include "wx/window.h"
     #include "wx/msgdlg.h"
     #include "wx/accel.h"
-    #include "wx/setup.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
     #include "wx/utils.h"
@@ -167,13 +166,13 @@ static ibool MGLAPI wxWindowMouseHandler(window_t *wnd, event_t *e)
     event.SetTimestamp(e->when);
     event.m_x = where.x - orig.x;
     event.m_y = where.y - orig.y;
-    event.m_shiftDown = e->modifiers & EVT_SHIFTKEY;
-    event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
-    event.m_altDown = e->modifiers & EVT_LEFTALT;
-    event.m_metaDown = e->modifiers & EVT_RIGHTALT;
-    event.m_leftDown = e->modifiers & EVT_LEFTBUT;
-    event.m_middleDown = e->modifiers & EVT_MIDDLEBUT;
-    event.m_rightDown = e->modifiers & EVT_RIGHTBUT;
+    event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
+    event.m_controlDown = ( e->modifiers & EVT_CTRLSTATE ) != 0;
+    event.m_altDown = ( e->modifiers & EVT_LEFTALT ) != 0;
+    event.m_metaDown = ( e->modifiers & EVT_RIGHTALT ) != 0;
+    event.m_leftDown = ( e->modifiers & EVT_LEFTBUT ) != 0;
+    event.m_middleDown = ( e->modifiers & EVT_MIDDLEBUT ) != 0;
+    event.m_rightDown = ( e->modifiers & EVT_RIGHTBUT ) != 0;
 
     switch (e->what)
     {
@@ -435,10 +434,10 @@ static bool wxHandleSpecialKeys(wxKeyEvent& event)
        )
     {
         wxCaptureScreenshot(event.m_altDown/*only active wnd?*/);
-        return TRUE;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
@@ -454,14 +453,14 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
     wxKeyEvent event;
     event.SetEventObject(win);
     event.SetTimestamp(e->when);
-    event.m_keyCode = wxScanToKeyCode(e, TRUE);
+    event.m_keyCode = wxScanToKeyCode(e, true);
     event.m_scanCode = 0; // not used by wx at all
     event.m_x = where.x;
     event.m_y = where.y;
-    event.m_shiftDown = e->modifiers & EVT_SHIFTKEY;
-    event.m_controlDown = e->modifiers & EVT_CTRLSTATE;
-    event.m_altDown = e->modifiers & EVT_LEFTALT;
-    event.m_metaDown = e->modifiers & EVT_RIGHTALT;
+    event.m_shiftDown = ( e->modifiers & EVT_SHIFTKEY ) != 0;
+    event.m_controlDown = ( e->modifiers & EVT_CTRLSTATE ) != 0;
+    event.m_altDown = ( e->modifiers & EVT_LEFTALT ) != 0;
+    event.m_metaDown = ( e->modifiers & EVT_RIGHTALT ) != 0;
 
     if ( e->what == EVT_KEYUP )
     {
@@ -481,7 +480,7 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
         // wxMSW doesn't send char events with Alt pressed
         // Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
         // will only be sent if it is not in an accelerator table:
-        event2.m_keyCode = wxScanToKeyCode(e, FALSE);
+        event2.m_keyCode = wxScanToKeyCode(e, false);
         if ( !ret && event2.m_keyCode != 0 )
         {
             event2.SetEventType(wxEVT_CHAR);
@@ -544,8 +543,8 @@ void wxWindowMGL::Init()
 
     // mgl specific:
     m_wnd = NULL;
-    m_isShown = TRUE;
-    m_frozen = FALSE;
+    m_isShown = true;
+    m_frozen = false;
     m_paintMGLDC = NULL;
     m_eraseBackground = -1;
 }
@@ -555,7 +554,7 @@ wxWindowMGL::~wxWindowMGL()
 {
     SendDestroyEvent();
 
-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
 
     if ( gs_mouseCapture == this )
         ReleaseMouse();
@@ -597,7 +596,7 @@ bool wxWindowMGL::Create(wxWindow *parent,
                          const wxString& name)
 {
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return FALSE;
+        return false;
 
     if ( parent )
         parent->AddChild(this);
@@ -627,7 +626,7 @@ bool wxWindowMGL::Create(wxWindow *parent,
     {
         mgl_style |= MGL_WM_ALWAYS_ON_TOP;
         // it is created hidden as other top level windows
-        m_isShown = FALSE;
+        m_isShown = false;
         wnd_parent = NULL;
     }
 
@@ -638,7 +637,7 @@ bool wxWindowMGL::Create(wxWindow *parent,
 
     SetMGLwindow_t(wnd);
 
-    return TRUE;
+    return true;
 }
 
 void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd)
@@ -649,7 +648,7 @@ void wxWindowMGL::SetMGLwindow_t(struct window_t *wnd)
     m_wnd = wnd;
     if ( !m_wnd ) return;
 
-    m_isShown = m_wnd->visible;
+    m_isShown = (bool)m_wnd->visible;
 
     MGL_wmSetWindowUserData(m_wnd, (void*) this);
     MGL_wmSetWindowPainter(m_wnd, wxWindowPainter);
@@ -688,13 +687,13 @@ void wxWindowMGL::SetFocus()
     {
         if ( gs_activeFrame )
         {
-            wxActivateEvent event(wxEVT_ACTIVATE, FALSE, gs_activeFrame->GetId());
+            wxActivateEvent event(wxEVT_ACTIVATE, false, gs_activeFrame->GetId());
             event.SetEventObject(gs_activeFrame);
             gs_activeFrame->GetEventHandler()->ProcessEvent(event);
         }
 
         gs_activeFrame = active;
-        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, gs_activeFrame->GetId());
+        wxActivateEvent event(wxEVT_ACTIVATE, true, gs_activeFrame->GetId());
         event.SetEventObject(gs_activeFrame);
         gs_activeFrame->GetEventHandler()->ProcessEvent(event);
     }
@@ -746,7 +745,7 @@ wxWindow *wxWindowBase::DoFindFocus()
 bool wxWindowMGL::Show(bool show)
 {
     if ( !wxWindowBase::Show(show) )
-        return FALSE;
+        return false;
 
     MGL_wmShowWindow(m_wnd, show);
 
@@ -769,7 +768,7 @@ bool wxWindowMGL::Show(bool show)
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 // Raise the window to the top of the Z order
@@ -811,7 +810,7 @@ bool wxWindowMGL::SetCursor(const wxCursor& cursor)
     if ( !wxWindowBase::SetCursor(cursor) )
     {
         // no change
-        return FALSE;
+        return false;
     }
 
     if ( m_cursor.Ok() )
@@ -819,7 +818,7 @@ bool wxWindowMGL::SetCursor(const wxCursor& cursor)
     else
         MGL_wmSetWindowCursor(m_wnd, *wxSTANDARD_CURSOR->GetMGLCursor());
 
-    return TRUE;
+    return true;
 }
 
 void wxWindowMGL::WarpPointer(int x, int y)
@@ -844,11 +843,11 @@ void wxWindowMGL::WarpPointer(int x, int y)
 bool wxWindowMGL::Reparent(wxWindowBase *parent)
 {
     if ( !wxWindowBase::Reparent(parent) )
-        return FALSE;
+        return false;
 
     MGL_wmReparentWindow(m_wnd, parent->GetHandle());
 
-    return TRUE;
+    return true;
 }
 
 
@@ -874,7 +873,7 @@ void wxWindowMGL::SetDropTarget(wxDropTarget *pDropTarget)
 
 // old style file-manager drag&drop support: we retain the old-style
 // DragAcceptFiles in parallel with SetDropTarget.
-void wxWindowMGL::DragAcceptFiles(bool accept)
+void wxWindowMGL::DragAcceptFiles(bool WXUNUSED(accept))
 {
 #if 0 // FIXME_MGL
     HWND hWnd = GetHwnd();
@@ -1043,7 +1042,8 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     {
         DoMoveWindow(x, y, width, height);
 
-        wxSizeEvent event(wxSize(width, height), GetId());
+        wxSize newSize(width, height);
+        wxSizeEvent event(newSize, GetId());
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
     }
@@ -1123,13 +1123,13 @@ void wxWindowMGL::Update()
 
 void wxWindowMGL::Freeze()
 {
-    m_frozen = TRUE;
-    m_refreshAfterThaw = FALSE;
+    m_frozen = true;
+    m_refreshAfterThaw = false;
 }
 
 void wxWindowMGL::Thaw()
 {
-    m_frozen = FALSE;
+    m_frozen = false;
     if ( m_refreshAfterThaw )
         Refresh();
 }
@@ -1139,7 +1139,7 @@ void wxWindowMGL::HandlePaint(MGLDevCtx *dc)
     if ( m_frozen )
     {
         // Don't paint anything if the window is frozen.
-        m_refreshAfterThaw = TRUE;
+        m_refreshAfterThaw = true;
         return;
     }