Typo, should be #if not #ifdef

[wxWidgets.git] / src / univ / topluniv.cpp

diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp
index f1dae67cb3be815a7e6df697b9e74bb16e1d0dfc..952f36201b773bd3401aef5c032ab521a7027b5e 100644 (file)
--- a/src/univ/topluniv.cpp
+++ b/src/univ/topluniv.cpp
@@ -14,10 +14,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univtoplevel.h"
-#endif
-

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


@@ -61,7 +57,7 @@ int wxTopLevelWindow::ms_canIconize = -1;
 
 void wxTopLevelWindow::Init()
 {
 
 void wxTopLevelWindow::Init()
 {

-    m_isActive = FALSE;
+    m_isActive = false;

     m_windowStyle = 0;
     m_pressedButton = 0;
 }
     m_windowStyle = 0;
     m_pressedButton = 0;
 }


@@ -101,14 +97,14 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
         style &= ~(wxCAPTION | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
                    wxSYSTEM_MENU | wxRESIZE_BORDER | wxFRAME_TOOL_WINDOW |
                    wxTHICK_FRAME);
         style &= ~(wxCAPTION | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
                    wxSYSTEM_MENU | wxRESIZE_BORDER | wxFRAME_TOOL_WINDOW |
                    wxTHICK_FRAME);

-        style = wxSIMPLE_BORDER;
+        style |= wxSIMPLE_BORDER;

         SetExtraStyle(exstyleOrig &
                       ~(wxFRAME_EX_CONTEXTHELP | wxDIALOG_EX_CONTEXTHELP));
     }
 
     if ( !wxTopLevelWindowNative::Create(parent, id, title, pos,
                                          size, style, name) )
         SetExtraStyle(exstyleOrig &
                       ~(wxFRAME_EX_CONTEXTHELP | wxDIALOG_EX_CONTEXTHELP));
     }
 
     if ( !wxTopLevelWindowNative::Create(parent, id, title, pos,
                                          size, style, name) )

-        return FALSE;
+        return false;

 
     if ( ms_drawDecorations )
     {
 
     if ( ms_drawDecorations )
     {


@@ -116,12 +112,12 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
         m_exStyle = exstyleOrig;
     }
 
         m_exStyle = exstyleOrig;
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxTopLevelWindow::ShowFullScreen(bool show, long style)
 {
 }
 
 bool wxTopLevelWindow::ShowFullScreen(bool show, long style)
 {

-    if ( show == IsFullScreen() ) return FALSE;
+    if ( show == IsFullScreen() ) return false;

 
     if ( ms_drawDecorations )
     {
 
     if ( ms_drawDecorations )
     {


@@ -238,7 +234,7 @@ void wxTopLevelWindow::DoSetClientSize(int width, int height)
         wxTopLevelWindowNative::DoSetClientSize(width, height);
 }
 
         wxTopLevelWindowNative::DoSetClientSize(width, height);
 }
 

-void wxTopLevelWindow::OnNcPaint(wxPaintEvent& event)
+void wxTopLevelWindow::OnNcPaint(wxNcPaintEvent& event)

 {
     if ( !ms_drawDecorations || !m_renderer )
         event.Skip();
 {
     if ( !ms_drawDecorations || !m_renderer )
         event.Skip();


@@ -305,7 +301,7 @@ void wxTopLevelWindow::SetIcons(const wxIconBundle& icons)
         wxSize size = m_renderer->GetFrameIconSize();
         const wxIcon& icon = icons.GetIcon( size );
 
         wxSize size = m_renderer->GetFrameIconSize();
         const wxIcon& icon = icons.GetIcon( size );
 

-        if ( !icon.Ok() || size.x == -1  )
+        if ( !icon.Ok() || size.x == wxDefaultCoord  )

             m_titlebarIcon = icon;
         else
         {
             m_titlebarIcon = icon;
         else
         {


@@ -353,13 +349,16 @@ static bool wxGetResizingCursor(long hitTestResult, wxCursor& cursor)
                 cursor = wxCursor(wxCURSOR_SIZENWSE);
                 break;
             default:
                 cursor = wxCursor(wxCURSOR_SIZENWSE);
                 break;
             default:

-                return FALSE;
+                return false;
+                #if 0
+                // not rachable due to earlier return

                 break;
                 break;

+                #endif

         }
         }

-        return TRUE;
+        return true;

     }
     
     }
     

-    return FALSE;
+    return false;

 }
 
 #define wxINTERACTIVE_RESIZE_DIR \
 }
 
 #define wxINTERACTIVE_RESIZE_DIR \


@@ -423,25 +422,25 @@ void wxApplyResize(wxInteractiveMoveData& data, const wxPoint& diff)
         data.m_rect.height += diff.y;
     }
     
         data.m_rect.height += diff.y;
     }
     

-    if ( data.m_minSize.x != -1 && data.m_rect.width < data.m_minSize.x )
+    if ( data.m_minSize.x != wxDefaultCoord && data.m_rect.width < data.m_minSize.x )

     {
         if ( data.m_flags & wxINTERACTIVE_RESIZE_W )
             data.m_rect.x -= data.m_minSize.x - data.m_rect.width;
         data.m_rect.width = data.m_minSize.x;
     }
     {
         if ( data.m_flags & wxINTERACTIVE_RESIZE_W )
             data.m_rect.x -= data.m_minSize.x - data.m_rect.width;
         data.m_rect.width = data.m_minSize.x;
     }

-    if ( data.m_maxSize.x != -1 && data.m_rect.width > data.m_maxSize.x )
+    if ( data.m_maxSize.x != wxDefaultCoord && data.m_rect.width > data.m_maxSize.x )

     {
         if ( data.m_flags & wxINTERACTIVE_RESIZE_W )
             data.m_rect.x -= data.m_minSize.x - data.m_rect.width;
         data.m_rect.width = data.m_maxSize.x;
     }
     {
         if ( data.m_flags & wxINTERACTIVE_RESIZE_W )
             data.m_rect.x -= data.m_minSize.x - data.m_rect.width;
         data.m_rect.width = data.m_maxSize.x;
     }

-    if ( data.m_minSize.y != -1 && data.m_rect.height < data.m_minSize.y )
+    if ( data.m_minSize.y != wxDefaultCoord && data.m_rect.height < data.m_minSize.y )

     {
         if ( data.m_flags & wxINTERACTIVE_RESIZE_N )
             data.m_rect.y -= data.m_minSize.y - data.m_rect.height;
         data.m_rect.height = data.m_minSize.y;
     }
     {
         if ( data.m_flags & wxINTERACTIVE_RESIZE_N )
             data.m_rect.y -= data.m_minSize.y - data.m_rect.height;
         data.m_rect.height = data.m_minSize.y;
     }

-    if ( data.m_maxSize.y != -1 && data.m_rect.height > data.m_maxSize.y )
+    if ( data.m_maxSize.y != wxDefaultCoord && data.m_rect.height > data.m_maxSize.y )

     {
         if ( data.m_flags & wxINTERACTIVE_RESIZE_N )
             data.m_rect.y -= data.m_minSize.y - data.m_rect.height;
     {
         if ( data.m_flags & wxINTERACTIVE_RESIZE_N )
             data.m_rect.y -= data.m_minSize.y - data.m_rect.height;


@@ -481,7 +480,7 @@ void wxInteractiveMoveHandler::OnMouseDown(wxMouseEvent& WXUNUSED(event))
 
 void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
 {
 
 void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
 {

-    wxPoint diff(-1,-1);
+    wxPoint diff(wxDefaultCoord,wxDefaultCoord);

     
     switch ( event.GetKeyCode() )
     {
     
     switch ( event.GetKeyCode() )
     {


@@ -498,7 +497,7 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
             return;
     }
     
             return;
     }
     

-    if ( diff.x != -1 )
+    if ( diff.x != wxDefaultCoord )

     {
         if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
         {
     {
         if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
         {


@@ -506,7 +505,7 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
             if ( m_data.m_sizingCursor )
             {
                 wxEndBusyCursor();
             if ( m_data.m_sizingCursor )
             {
                 wxEndBusyCursor();

-                m_data.m_sizingCursor = FALSE;
+                m_data.m_sizingCursor = false;

             }
 
             if ( m_data.m_flags & wxINTERACTIVE_MOVE )
             }
 
             if ( m_data.m_flags & wxINTERACTIVE_MOVE )


@@ -517,7 +516,7 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
         }
 
         wxPoint warp;
         }
 
         wxPoint warp;

-        bool changeCur = FALSE;
+        bool changeCur = false;

         
         if ( m_data.m_flags & wxINTERACTIVE_MOVE )
         {
         
         if ( m_data.m_flags & wxINTERACTIVE_MOVE )
         {


@@ -534,14 +533,14 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
                 {
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_N;
                     m_data.m_pos.y = m_data.m_window->GetPosition().y;
                 {
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_N;
                     m_data.m_pos.y = m_data.m_window->GetPosition().y;

-                    changeCur = TRUE;
+                    changeCur = true;

                 }
                 else if ( diff.y > 0 )
                 {
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_S;
                     m_data.m_pos.y = m_data.m_window->GetPosition().y +
                                      m_data.m_window->GetSize().y;
                 }
                 else if ( diff.y > 0 )
                 {
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_S;
                     m_data.m_pos.y = m_data.m_window->GetPosition().y +
                                      m_data.m_window->GetSize().y;

-                    changeCur = TRUE;
+                    changeCur = true;

                 }
             }
             if ( !(m_data.m_flags & 
                 }
             }
             if ( !(m_data.m_flags & 


@@ -551,14 +550,14 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
                 {
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_W;
                     m_data.m_pos.x = m_data.m_window->GetPosition().x;
                 {
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_W;
                     m_data.m_pos.x = m_data.m_window->GetPosition().x;

-                    changeCur = TRUE;
+                    changeCur = true;

                 }
                 else if ( diff.x > 0 )
                 {
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_E;
                     m_data.m_pos.x = m_data.m_window->GetPosition().x +
                                      m_data.m_window->GetSize().x;
                 }
                 else if ( diff.x > 0 )
                 {
                     m_data.m_flags |= wxINTERACTIVE_RESIZE_E;
                     m_data.m_pos.x = m_data.m_window->GetPosition().x +
                                      m_data.m_window->GetSize().x;

-                    changeCur = TRUE;
+                    changeCur = true;

                 }
             }
 
                 }
             }
 


@@ -592,7 +591,7 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
                 if ( m_data.m_sizingCursor )
                     wxEndBusyCursor();
                 wxBeginBusyCursor(&cur);
                 if ( m_data.m_sizingCursor )
                     wxEndBusyCursor();
                 wxBeginBusyCursor(&cur);

-                m_data.m_sizingCursor = TRUE;
+                m_data.m_sizingCursor = true;

             }
         }
     }
             }
         }
     }


@@ -624,11 +623,11 @@ void wxTopLevelWindow::InteractiveMove(int flags)
     {
         wxCursor sizingCursor(wxCURSOR_SIZING);
         wxBeginBusyCursor(&sizingCursor);
     {
         wxCursor sizingCursor(wxCURSOR_SIZING);
         wxBeginBusyCursor(&sizingCursor);

-        data.m_sizingCursor = TRUE;
+        data.m_sizingCursor = true;

     }
     else
 #endif
     }
     else
 #endif

-        data.m_sizingCursor = FALSE;
+        data.m_sizingCursor = false;

 
     data.m_window = this;
     data.m_evtLoop = &loop;
 
     data.m_window = this;
     data.m_evtLoop = &loop;


@@ -702,21 +701,21 @@ bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
             m_isActive = isActive;
             RefreshTitleBar();
         }
             m_isActive = isActive;
             RefreshTitleBar();
         }

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_PRESS )
     {
         m_pressedButton = numArg;
         RefreshTitleBar();
     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_PRESS )
     {
         m_pressedButton = numArg;
         RefreshTitleBar();

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_RELEASE )
     {
         m_pressedButton = 0;
         RefreshTitleBar();
     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_RELEASE )
     {
         m_pressedButton = 0;
         RefreshTitleBar();

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_CLICK )
     }
 
     else if ( action == wxACTION_TOPLEVEL_BUTTON_CLICK )


@@ -724,13 +723,13 @@ bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
         m_pressedButton = 0;
         RefreshTitleBar();
         ClickTitleBarButton(numArg);
         m_pressedButton = 0;
         RefreshTitleBar();
         ClickTitleBarButton(numArg);

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_MOVE )
     {
         InteractiveMove(wxINTERACTIVE_MOVE);
     }
 
     else if ( action == wxACTION_TOPLEVEL_MOVE )
     {
         InteractiveMove(wxINTERACTIVE_MOVE);

-        return TRUE;
+        return true;

     }
 
     else if ( action == wxACTION_TOPLEVEL_RESIZE )
     }
 
     else if ( action == wxACTION_TOPLEVEL_RESIZE )


@@ -745,16 +744,16 @@ bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
         if ( numArg & wxHT_TOPLEVEL_BORDER_E )
             flags |= wxINTERACTIVE_RESIZE_E;
         InteractiveMove(flags);
         if ( numArg & wxHT_TOPLEVEL_BORDER_E )
             flags |= wxINTERACTIVE_RESIZE_E;
         InteractiveMove(flags);

-        return TRUE;
+        return true;

     }
 
     else
     }
 
     else

-        return FALSE;
+        return false;

 }
 
 void wxTopLevelWindow::OnSystemMenu(wxCommandEvent& event)
 {
 }
 
 void wxTopLevelWindow::OnSystemMenu(wxCommandEvent& event)
 {

-    bool ret = TRUE;
+    bool ret = true;

     
     switch (event.GetId())
     {
     
     switch (event.GetId())
     {


@@ -782,7 +781,7 @@ void wxTopLevelWindow::OnSystemMenu(wxCommandEvent& event)
             break;
 
         default:
             break;
 
         default:

-            ret = FALSE;
+            ret = false;

     }
     
     if ( !ret )
     }
     
     if ( !ret )


@@ -800,7 +799,7 @@ wxStdFrameInputHandler::wxStdFrameInputHandler(wxInputHandler *inphand)
     m_winCapture = NULL;
     m_winHitTest = 0;
     m_winPressed = 0;
     m_winCapture = NULL;
     m_winHitTest = 0;
     m_winPressed = 0;

-    m_borderCursorOn = FALSE;
+    m_borderCursorOn = false;

 }
 
 bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer,
 }
 
 bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer,


@@ -828,18 +827,18 @@ bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer,
                 m_winHitTest = hit;
                 m_winPressed = hit;
                 consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_PRESS, m_winPressed);
                 m_winHitTest = hit;
                 m_winPressed = hit;
                 consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_PRESS, m_winPressed);

-                return TRUE;
+                return true;

             }
             else if ( (hit & wxHT_TOPLEVEL_TITLEBAR) && !w->IsMaximized() )
             {
                 consumer->PerformAction(wxACTION_TOPLEVEL_MOVE);
             }
             else if ( (hit & wxHT_TOPLEVEL_TITLEBAR) && !w->IsMaximized() )
             {
                 consumer->PerformAction(wxACTION_TOPLEVEL_MOVE);

-                return TRUE;
+                return true;

             }
             else if ( (consumer->GetInputWindow()->GetWindowStyle() & wxRESIZE_BORDER)
                       && (hit & wxHT_TOPLEVEL_ANY_BORDER) )
             {
                 consumer->PerformAction(wxACTION_TOPLEVEL_RESIZE, hit);
             }
             else if ( (consumer->GetInputWindow()->GetWindowStyle() & wxRESIZE_BORDER)
                       && (hit & wxHT_TOPLEVEL_ANY_BORDER) )
             {
                 consumer->PerformAction(wxACTION_TOPLEVEL_RESIZE, hit);

-                return TRUE;
+                return true;

             }
         }
 
             }
         }
 


@@ -853,7 +852,7 @@ bool wxStdFrameInputHandler::HandleMouse(wxInputConsumer *consumer,
                 if ( m_winHitTest == m_winPressed )
                 {
                     consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK, m_winPressed);
                 if ( m_winHitTest == m_winPressed )
                 {
                     consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK, m_winPressed);

-                    return TRUE;
+                    return true;

                 }
             }
             //else: the mouse was released outside the window, this doesn't
                 }
             }
             //else: the mouse was released outside the window, this doesn't


@@ -879,7 +878,7 @@ bool wxStdFrameInputHandler::HandleMouseMove(wxInputConsumer *consumer,
                 consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_PRESS, m_winPressed);
 
             m_winHitTest = hit;
                 consumer->PerformAction(wxACTION_TOPLEVEL_BUTTON_PRESS, m_winPressed);
 
             m_winHitTest = hit;

-            return TRUE;
+            return true;

         }
     }
     else if ( consumer->GetInputWindow()->GetWindowStyle() & wxRESIZE_BORDER )
         }
     }
     else if ( consumer->GetInputWindow()->GetWindowStyle() & wxRESIZE_BORDER )


@@ -894,7 +893,7 @@ bool wxStdFrameInputHandler::HandleMouseMove(wxInputConsumer *consumer,
 
             if ( m_borderCursorOn )
             {
 
             if ( m_borderCursorOn )
             {

-                m_borderCursorOn = FALSE;
+                m_borderCursorOn = false;

                 win->SetCursor(m_origCursor);
             }
 
                 win->SetCursor(m_origCursor);
             }
 


@@ -921,8 +920,8 @@ bool wxStdFrameInputHandler::HandleActivation(wxInputConsumer *consumer,
     if ( m_borderCursorOn )
     {
         consumer->GetInputWindow()->SetCursor(m_origCursor);
     if ( m_borderCursorOn )
     {
         consumer->GetInputWindow()->SetCursor(m_origCursor);

-        m_borderCursorOn = FALSE;
+        m_borderCursorOn = false;

     }
     consumer->PerformAction(wxACTION_TOPLEVEL_ACTIVATE, activated);
     }
     consumer->PerformAction(wxACTION_TOPLEVEL_ACTIVATE, activated);

-    return FALSE;
+    return false;

 }
 }