// Created: 06.08.00
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "univwindow.h"
#endif
m_scrollbarVert =
m_scrollbarHorz = (wxScrollBar *)NULL;
- m_isCurrent = FALSE;
+ m_isCurrent = false;
m_renderer = wxTheme::Get()->GetRenderer();
- m_oldSize.x = -1;
- m_oldSize.y = -1;
+ m_oldSize.x = wxDefaultCoord;
+ m_oldSize.y = wxDefaultCoord;
}
bool wxWindow::Create(wxWindow *parent,
long style,
const wxString& name)
{
+ long actualStyle = style;
+
+ // FIXME: may need this on other platforms
+#ifdef __WXMSW__
+ actualStyle &= ~wxVSCROLL;
+ actualStyle &= ~wxHSCROLL;
+#endif
+
// we add wxCLIP_CHILDREN to get the same ("natural") behaviour under MSW
// as under the other platforms
if ( !wxWindowNative::Create(parent, id, pos, size,
- style | wxCLIP_CHILDREN,
+ actualStyle | wxCLIP_CHILDREN,
name) )
{
- return FALSE;
+ return false;
}
- // if we should always have the scrollbar, do show it
- if ( GetWindowStyle() & wxALWAYS_SHOW_SB )
+ // Set full style again, including those we didn't want present
+ // when calling the base window Create().
+ wxWindowBase::SetWindowStyleFlag(style);
+
+ // if we should always have a vertical scrollbar, do show it
+ if ( style & wxALWAYS_SHOW_SB )
{
#if wxUSE_TWO_WINDOWS
- SetInsertIntoMain( TRUE );
+ SetInsertIntoMain( true );
#endif
- m_scrollbarVert = new wxScrollBar(this, -1,
+ m_scrollbarVert = new wxScrollBar(this, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
wxSB_VERTICAL);
#if wxUSE_TWO_WINDOWS
- SetInsertIntoMain( FALSE );
+ SetInsertIntoMain( false );
#endif
+ }
- // and position it
+ // if we should always have a horizontal scrollbar, do show it
+ if ( style & wxHSCROLL )
+ {
+#if wxUSE_TWO_WINDOWS
+ SetInsertIntoMain( true );
+#endif
+ m_scrollbarHorz = new wxScrollBar(this, wxID_ANY,
+ wxDefaultPosition, wxDefaultSize,
+ wxSB_HORIZONTAL);
+#if wxUSE_TWO_WINDOWS
+ SetInsertIntoMain( false );
+#endif
+ }
+
+ if (m_scrollbarHorz || m_scrollbarVert)
+ {
+ // position it/them
PositionScrollbars();
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// the event handlers executed when the window must be repainted
-void wxWindow::OnNcPaint(wxPaintEvent& event)
+void wxWindow::OnNcPaint(wxNcPaintEvent& WXUNUSED(event))
{
if ( m_renderer )
{
AdjustForParentClientOrigin( pos.x, pos.y, 0 );
// Adjust DC logical origin
- wxCoord x,y;
- dc.GetLogicalOrigin( &x, &y );
- x += pos.x;
- y += pos.y;
+ wxCoord org_x, org_y, x, y;
+ dc.GetLogicalOrigin( &org_x, &org_y );
+ x = org_x + pos.x;
+ y = org_y + pos.y;
dc.SetLogicalOrigin( x, y );
// Adjust draw rect
// Let parent draw the background
parent->EraseBackground( dc, rect );
+
+ // Restore DC logical origin
+ dc.SetLogicalOrigin( org_x, org_y );
}
else
{
EraseBackground( dc, rect );
}
- return TRUE;
+ return true;
}
void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)
}
}
-void wxWindow::DoDraw(wxControlRenderer *renderer)
+void wxWindow::DoDraw(wxControlRenderer * WXUNUSED(renderer))
{
}
// debugging helper
#ifdef WXDEBUG_REFRESH
- static bool s_refreshDebug = FALSE;
+ static bool s_refreshDebug = false;
if ( s_refreshDebug )
{
wxWindowDC dc(this);
#endif // WXDEBUG_REFRESH
wxWindowNative::Refresh(eraseBackground, &rectWin);
+
+ // Refresh all sub controls if any.
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+ while ( node )
+ {
+ wxWindow *win = node->GetData();
+ // Only refresh sub controls when it is visible
+ // and when it is in the update region.
+ if(!win->IsKindOf(CLASSINFO(wxTopLevelWindow)) && win->IsShown() && wxRegion(rectWin).Contains(win->GetRect()) != wxOutRegion)
+ win->Refresh(eraseBackground, &rectWin);
+
+ node = node->GetNext();
+ }
}
// ----------------------------------------------------------------------------
bool wxWindow::Enable(bool enable)
{
if ( !wxWindowNative::Enable(enable) )
- return FALSE;
+ return false;
// disabled window can't keep focus
if ( FindFocus() == this && GetParent() != NULL )
Refresh();
}
- return TRUE;
+ return true;
}
bool wxWindow::IsFocused() const
bool wxWindow::IsPressed() const
{
- return FALSE;
+ return false;
}
bool wxWindow::IsDefault() const
{
- return FALSE;
+ return false;
}
bool wxWindow::IsCurrent() const
bool wxWindow::SetCurrent(bool doit)
{
if ( doit == m_isCurrent )
- return FALSE;
+ return false;
m_isCurrent = doit;
if ( CanBeHighlighted() )
Refresh();
- return TRUE;
+ return true;
}
int wxWindow::GetStateFlags() const
#if 0 // ndef __WXMSW__
// Refresh the area (strip) previously occupied by the border
- if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ) && IsShown())
+ if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) && IsShown() )
{
// This code assumes that wxSizeEvent.GetSize() returns
// the area of the entire window, not just the client
// area.
wxSize newSize = event.GetSize();
- if (m_oldSize.x == -1 && m_oldSize.y == -1)
+ if (m_oldSize.x == wxDefaultCoord && m_oldSize.y == wxDefaultCoord)
{
m_oldSize = newSize;
return;
rect.width = m_oldSize.x;
rect.y = m_oldSize.y-2;
rect.height = 1;
- Refresh( TRUE, &rect );
+ Refresh( true, &rect );
}
else if (newSize.y < m_oldSize.y)
{
rect.x = 0;
rect.height = 1;
rect.width = newSize.x;
- wxWindowNative::Refresh( TRUE, &rect );
+ wxWindowNative::Refresh( true, &rect );
}
if (newSize.x > m_oldSize.x)
rect.height = m_oldSize.y;
rect.x = m_oldSize.x-2;
rect.width = 1;
- Refresh( TRUE, &rect );
+ Refresh( true, &rect );
}
else if (newSize.x < m_oldSize.x)
{
rect.y = 0;
rect.width = 1;
rect.height = newSize.y;
- wxWindowNative::Refresh( TRUE, &rect );
+ wxWindowNative::Refresh( true, &rect );
}
}
else
rect.width = m_oldSize.x;
rect.y = m_oldSize.y-4;
rect.height = 2;
- Refresh( TRUE, &rect );
+ Refresh( true, &rect );
}
else if (newSize.y < m_oldSize.y)
{
rect.x = 0;
rect.height = 2;
rect.width = newSize.x;
- wxWindowNative::Refresh( TRUE, &rect );
+ wxWindowNative::Refresh( true, &rect );
}
if (newSize.x > m_oldSize.x)
rect.height = m_oldSize.y;
rect.x = m_oldSize.x-4;
rect.width = 2;
- Refresh( TRUE, &rect );
+ Refresh( true, &rect );
}
else if (newSize.x < m_oldSize.x)
{
rect.y = 0;
rect.width = 2;
rect.height = newSize.y;
- wxWindowNative::Refresh( TRUE, &rect );
+ wxWindowNative::Refresh( true, &rect );
}
}
wxASSERT_MSG( pageSize <= range,
_T("page size can't be greater than range") );
- bool hasClientSizeChanged = FALSE;
+ bool hasClientSizeChanged = false;
wxScrollBar *scrollbar = GetScrollbar(orient);
if ( range && (pageSize < range) )
{
{
// create it
#if wxUSE_TWO_WINDOWS
- SetInsertIntoMain( TRUE );
+ SetInsertIntoMain( true );
#endif
- scrollbar = new wxScrollBar(this, -1,
+ scrollbar = new wxScrollBar(this, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
orient & wxVERTICAL ? wxSB_VERTICAL
: wxSB_HORIZONTAL);
#if wxUSE_TWO_WINDOWS
- SetInsertIntoMain( FALSE );
+ SetInsertIntoMain( false );
#endif
if ( orient & wxVERTICAL )
m_scrollbarVert = scrollbar;
m_scrollbarHorz = scrollbar;
// the client area diminished as we created a scrollbar
- hasClientSizeChanged = TRUE;
+ hasClientSizeChanged = true;
PositionScrollbars();
}
m_scrollbarHorz = NULL;
// the client area increased as we removed a scrollbar
- hasClientSizeChanged = TRUE;
+ hasClientSizeChanged = true;
// the size of the remaining scrollbar must be adjusted
if ( m_scrollbarHorz || m_scrollbarVert )
}
}
-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
{
wxScrollBar *scrollbar = GetScrollbar(orient);
wxCHECK_RET( scrollbar, _T("no scrollbar to set position for") );
if ( dx )
{
r = ScrollNoRefresh(dx, 0, rect);
- Refresh(TRUE /* erase bkgnd */, &r);
+ Refresh(true /* erase bkgnd */, &r);
}
if ( dy )
{
r = ScrollNoRefresh(0, dy, rect);
- Refresh(TRUE /* erase bkgnd */, &r);
+ Refresh(true /* erase bkgnd */, &r);
}
// scroll children accordingly:
wxPoint offset(dx, dy);
- for (wxWindowList::Node *node = GetChildren().GetFirst();
+ for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
node; node = node->GetNext())
{
wxWindow *child = node->GetData();
#include "wx/msw/private.h"
-long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
if ( message == WM_NCHITTEST )
{
projects / wxWidgets.git / blobdiff