Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed every usage of obsolete wxTLW flags. 2.6 compatibility markup for them.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-31 18:07:22 +00:00
parent ed177375b2
commit 1c067fe3c1
36 changed files with 243 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/univ/topluniv.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: topluniv.cpp
// Name: src/univ/topluniv.cpp
// Author: Vaclav Slavik
// Id: $Id$
// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
@@ -21,8 +21,6 @@
#pragma hdrstop
#endif
#include "wx/defs.h"
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
#include "wx/settings.h"
@@ -76,8 +74,8 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
if ( ms_drawDecorations == -1 )
{
ms_drawDecorations =
!wxSystemSettings::HasFeature(wxSYS_CAN_DRAW_FRAME_DECORATIONS)
ms_drawDecorations =
!wxSystemSettings::HasFeature(wxSYS_CAN_DRAW_FRAME_DECORATIONS)
|| wxGetEnv(wxT("WXDECOR"), NULL);
// FIXME -- wxUniv should provide a way to force non-native decorations!
// $WXDECOR is just a hack in absence of better wxUniv solution
@@ -96,7 +94,7 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
exstyleOrig = GetExtraStyle();
style &= ~(wxCAPTION | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
wxSYSTEM_MENU | wxRESIZE_BORDER | wxFRAME_TOOL_WINDOW |
wxTHICK_FRAME);
wxRESIZE_BORDER);
style |= wxSIMPLE_BORDER;
SetExtraStyle(exstyleOrig &
~(wxFRAME_EX_CONTEXTHELP | wxDIALOG_EX_CONTEXTHELP));
@@ -161,7 +159,7 @@ long wxTopLevelWindow::GetDecorationsStyle() const
}
if ( (m_windowStyle & (wxSIMPLE_BORDER | wxNO_BORDER)) == 0 )
style |= wxTOPLEVEL_BORDER;
if ( m_windowStyle & (wxRESIZE_BORDER | wxTHICK_FRAME) )
if ( m_windowStyle & (wxRESIZE_BORDER | wxRESIZE_BORDER) )
style |= wxTOPLEVEL_RESIZEABLE;
if ( IsMaximized() )
@@ -350,14 +348,10 @@ static bool wxGetResizingCursor(long hitTestResult, wxCursor& cursor)
break;
default:
return false;
#if 0
// not rachable due to earlier return
break;
#endif
}
return true;
}
return false;
}
@@ -381,7 +375,7 @@ class wxInteractiveMoveHandler : public wxEvtHandler
{
public:
wxInteractiveMoveHandler(wxInteractiveMoveData& data) : m_data(data) {}
private:
DECLARE_EVENT_TABLE()
void OnMouseMove(wxMouseEvent& event);
@@ -400,7 +394,7 @@ BEGIN_EVENT_TABLE(wxInteractiveMoveHandler, wxEvtHandler)
END_EVENT_TABLE()
static inline LINKAGEMODE
static inline LINKAGEMODE
void wxApplyResize(wxInteractiveMoveData& data, const wxPoint& diff)
{
if ( data.m_flags & wxINTERACTIVE_RESIZE_W )
@@ -421,7 +415,7 @@ void wxApplyResize(wxInteractiveMoveData& data, const wxPoint& diff)
{
data.m_rect.height += diff.y;
}
if ( data.m_minSize.x != wxDefaultCoord && data.m_rect.width < data.m_minSize.x )
{
if ( data.m_flags & wxINTERACTIVE_RESIZE_W )
@@ -481,7 +475,7 @@ void wxInteractiveMoveHandler::OnMouseDown(wxMouseEvent& WXUNUSED(event))
void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
{
wxPoint diff(wxDefaultCoord,wxDefaultCoord);
switch ( event.GetKeyCode() )
{
case WXK_UP: diff = wxPoint(0, -16); break;
@@ -496,7 +490,7 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
m_data.m_evtLoop->Exit();
return;
}
if ( diff.x != wxDefaultCoord )
{
if ( m_data.m_flags & wxINTERACTIVE_WAIT_FOR_INPUT )
@@ -510,14 +504,14 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
if ( m_data.m_flags & wxINTERACTIVE_MOVE )
{
m_data.m_pos = m_data.m_window->GetPosition() +
m_data.m_pos = m_data.m_window->GetPosition() +
wxPoint(m_data.m_window->GetSize().x/2, 8);
}
}
wxPoint warp;
bool changeCur = false;
if ( m_data.m_flags & wxINTERACTIVE_MOVE )
{
m_data.m_rect.Offset(diff);
@@ -526,7 +520,7 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
}
else /* wxINTERACTIVE_RESIZE */
{
if ( !(m_data.m_flags &
if ( !(m_data.m_flags &
(wxINTERACTIVE_RESIZE_N | wxINTERACTIVE_RESIZE_S)) )
{
if ( diff.y < 0 )
@@ -543,7 +537,7 @@ void wxInteractiveMoveHandler::OnKeyDown(wxKeyEvent& event)
changeCur = true;
}
}
if ( !(m_data.m_flags &
if ( !(m_data.m_flags &
(wxINTERACTIVE_RESIZE_W | wxINTERACTIVE_RESIZE_E)) )
{
if ( diff.x < 0 )
@@ -608,17 +602,17 @@ void wxTopLevelWindow::InteractiveMove(int flags)
wxASSERT_MSG( !((flags & wxINTERACTIVE_MOVE) && (flags & wxINTERACTIVE_RESIZE)),
wxT("can't move and resize window at the same time") );
wxASSERT_MSG( !(flags & wxINTERACTIVE_RESIZE) ||
(flags & wxINTERACTIVE_WAIT_FOR_INPUT) ||
wxASSERT_MSG( !(flags & wxINTERACTIVE_RESIZE) ||
(flags & wxINTERACTIVE_WAIT_FOR_INPUT) ||
(flags & wxINTERACTIVE_RESIZE_DIR),
wxT("direction of resizing not specified") );
wxInteractiveMoveData data;
wxEventLoop loop;
SetFocus();
#ifndef __WXGTK__
#ifndef __WXGTK__
if ( flags & wxINTERACTIVE_WAIT_FOR_INPUT )
{
wxCursor sizingCursor(wxCURSOR_SIZING);
@@ -754,7 +748,7 @@ bool wxTopLevelWindow::PerformAction(const wxControlAction& action,
void wxTopLevelWindow::OnSystemMenu(wxCommandEvent& event)
{
bool ret = true;
switch (event.GetId())
{
case wxID_CLOSE_FRAME:
@@ -783,7 +777,7 @@ void wxTopLevelWindow::OnSystemMenu(wxCommandEvent& event)
default:
ret = false;
}
if ( !ret )
event.Skip();
}