/////////////////////////////////////////////////////////////////////////////
-// Name: control.cpp
+// Name: src/msw/control.cpp
// Purpose: wxControl class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "control.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
+#if wxUSE_CONTROLS
+
+#include "wx/control.h"
+
#ifndef WX_PRECOMP
-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/dcclient.h"
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+ #include "wx/event.h"
+ #include "wx/app.h"
+ #include "wx/dcclient.h"
+ #include "wx/log.h"
+ #include "wx/settings.h"
+ #include "wx/ctrlsub.h"
#endif
-#include "wx/control.h"
+#if wxUSE_LISTCTRL
+ #include "wx/listctrl.h"
+#endif // wxUSE_LISTCTRL
-#include "wx/msw/private.h"
+#if wxUSE_TREECTRL
+ #include "wx/treectrl.h"
+#endif // wxUSE_TREECTRL
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
-#include <commctrl.h>
-#endif
+#include "wx/msw/private.h"
+#include "wx/msw/uxtheme.h"
-#ifdef GetCharWidth
-#undef GetCharWidth
-#undef GetWindowProc
-#endif
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
-BEGIN_EVENT_TABLE(wxControl, wxWindow)
- EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
-END_EVENT_TABLE()
+// ============================================================================
+// wxControl implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// control window creation
+// ----------------------------------------------------------------------------
+
+bool wxControl::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& wxVALIDATOR_PARAM(validator),
+ const wxString& name)
+{
+ if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+ return false;
+
+#if wxUSE_VALIDATORS
+ SetValidator(validator);
#endif
-// Item members
-wxControl::wxControl(void)
-{
- m_backgroundColour = *wxWHITE;
- m_foregroundColour = *wxBLACK;
- m_callback = 0;
+ return true;
}
-wxControl::~wxControl(void)
+bool wxControl::MSWCreateControl(const wxChar *classname,
+ const wxString& label,
+ const wxPoint& pos,
+ const wxSize& size)
{
- m_isBeingDeleted = TRUE;
-
- // If we delete an item, we should initialize the parent panel,
- // because it could now be invalid.
- wxWindow *parent = (wxWindow *)GetParent();
- if (parent)
- {
- if (parent->GetDefaultItem() == (wxButton*) this)
- parent->SetDefaultItem(NULL);
- }
-}
+ WXDWORD exstyle;
+ WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), &exstyle);
-void wxControl::SetLabel(const wxString& label)
-{
- if (GetHWND())
- SetWindowText((HWND) GetHWND(), (const char *)label);
+ return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);
}
-wxString wxControl::GetLabel(void) const
+bool wxControl::MSWCreateControl(const wxChar *classname,
+ WXDWORD style,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxString& label,
+ WXDWORD exstyle)
{
- wxBuffer[0] = 0;
- if (GetHWND())
+ // if no extended style given, determine it ourselves
+ if ( exstyle == (WXDWORD)-1 )
{
- int len = GetWindowText((HWND)GetHWND(), wxBuffer, 256);
- wxBuffer[len] = 0;
+ exstyle = 0;
+ (void) MSWGetStyle(GetWindowStyle(), &exstyle);
}
- return wxString(wxBuffer);
-}
+ // all controls should have this style
+ style |= WS_CHILD;
-// Call this repeatedly for several wnds to find the overall size
-// of the widget.
-// Call it initially with -1 for all values in rect.
-// Keep calling for other widgets, and rect will be modified
-// to calculate largest bounding rectangle.
-void wxFindMaxSize(WXHWND wnd, RECT *rect)
-{
- int left = rect->left;
- int right = rect->right;
- int top = rect->top;
- int bottom = rect->bottom;
+ // create the control visible if it's currently shown for wxWidgets
+ if ( m_isShown )
+ {
+ style |= WS_VISIBLE;
+ }
+
+ // choose the position for the control: we have a problem with default size
+ // here as we can't calculate the best size before the control exists
+ // (DoGetBestSize() may need to use m_hWnd), so just choose the minimal
+ // possible but non 0 size because 0 window width/height result in problems
+ // elsewhere
+ int x = pos.x == wxDefaultCoord ? 0 : pos.x,
+ y = pos.y == wxDefaultCoord ? 0 : pos.y,
+ w = size.x == wxDefaultCoord ? 1 : size.x,
+ h = size.y == wxDefaultCoord ? 1 : size.y;
+
+ // ... and adjust it to account for a possible parent frames toolbar
+ AdjustForParentClientOrigin(x, y);
+
+ m_hWnd = (WXHWND)::CreateWindowEx
+ (
+ exstyle, // extended style
+ classname, // the kind of control to create
+ label.wx_str(), // the window name
+ style, // the window style
+ x, y, w, h, // the window position and size
+ GetHwndOf(GetParent()), // parent
+ (HMENU)wxUIntToPtr(GetId()), // child id
+ wxGetInstance(), // app instance
+ NULL // creation parameters
+ );
+
+ if ( !m_hWnd )
+ {
+#ifdef __WXDEBUG__
+ wxLogLastError(wxString::Format
+ (
+ _T("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
+ classname, style, exstyle
+ ));
+#endif // __WXDEBUG__
+
+ return false;
+ }
- GetWindowRect((HWND) wnd, rect);
+#if !wxUSE_UNICODE
+ // Text labels starting with the character 0xff (which is a valid character
+ // in many code pages) don't appear correctly as CreateWindowEx() has some
+ // special treatment for this case, apparently the strings starting with -1
+ // are not really strings but something called "ordinals". There is no
+ // documentation about it but the fact is that the label gets mangled or
+ // not displayed at all if we don't do this, see #9572.
+ //
+ // Notice that 0xffff is not a valid Unicode character so the problem
+ // doesn't arise in Unicode build.
+ if ( !label.empty() && label[0] == -1 )
+ ::SetWindowText(GetHwnd(), label.wx_str());
+#endif // !wxUSE_UNICODE
+
+ // saving the label in m_labelOrig to return it verbatim
+ // later in GetLabel()
+ m_labelOrig = label;
+
+ // install wxWidgets window proc for this window
+ SubclassWin(m_hWnd);
+
+ // set up fonts and colours
+ InheritAttributes();
+ if ( !m_hasFont )
+ {
+ bool setFont = true;
+
+ wxFont font = GetDefaultAttributes().font;
+
+ // if we set a font for {list,tree}ctrls and the font size is changed in
+ // the display properties then the font size for these controls doesn't
+ // automatically adjust when they receive WM_SETTINGCHANGE
+
+ // FIXME: replace the dynamic casts with virtual function calls!!
+#if wxUSE_LISTCTRL || wxUSE_TREECTRL
+ bool testFont = false;
+#if wxUSE_LISTCTRL
+ if ( wxDynamicCastThis(wxListCtrl) )
+ testFont = true;
+#endif // wxUSE_LISTCTRL
+#if wxUSE_TREECTRL
+ if ( wxDynamicCastThis(wxTreeCtrl) )
+ testFont = true;
+#endif // wxUSE_TREECTRL
+
+ if ( testFont )
+ {
+ // not sure if we need to explicitly set the font here for Win95/NT4
+ // but we definitely can't do it for any newer version
+ // see wxGetCCDefaultFont() in src/msw/settings.cpp for explanation
+ // of why this test works
+
+ // TODO: test Win95/NT4 to see if this is needed or breaks the
+ // font resizing as it does on newer versions
+ if ( font != wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) )
+ {
+ setFont = false;
+ }
+ }
+#endif // wxUSE_LISTCTRL || wxUSE_TREECTRL
+
+ if ( setFont )
+ {
+ SetFont(GetDefaultAttributes().font);
+ }
+ }
- if (left < 0)
- return;
+ // set the size now if no initial size specified
+ SetInitialSize(size);
- if (left < rect->left)
- rect->left = left;
+ return true;
+}
- if (right > rect->right)
- rect->right = right;
+// ----------------------------------------------------------------------------
+// various accessors
+// ----------------------------------------------------------------------------
- if (top < rect->top)
- rect->top = top;
+WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+ long msStyle = wxWindow::MSWGetStyle(style, exstyle);
- if (bottom > rect->bottom)
- rect->bottom = bottom;
+ if ( AcceptsFocusFromKeyboard() )
+ {
+ msStyle |= WS_TABSTOP;
+ }
+ return msStyle;
}
-/*
-// Not currently used
-void wxConvertDialogToPixels(wxWindow *control, int *x, int *y)
+wxSize wxControl::DoGetBestSize() const
{
- if (control->m_windowParent && control->m_windowParent->is_dialog)
- {
- DWORD word = GetDialogBaseUnits();
- int xs = LOWORD(word);
- int ys = HIWORD(word);
- *x = (int)(*x * xs/4);
- *y = (int)(*y * ys/8);
- }
- else
- {
- *x = *x;
- *y = *y;
- }
+ return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
}
-*/
-void wxControl::MSWOnMouseMove(int x, int y, WXUINT flags)
+wxBorder wxControl::GetDefaultBorder() const
{
-/*
- // Trouble with this is that it sets the cursor for controls too :-(
- if (m_windowCursor.Ok() && !wxIsBusy())
- ::SetCursor(m_windowCursor.GetHCURSOR());
-*/
-
- if (!m_mouseInWindow)
- {
- // Generate an ENTER event
- m_mouseInWindow = TRUE;
- MSWOnMouseEnter(x, y, flags);
- }
-
- wxMouseEvent event(wxEVT_MOTION);
-
- event.m_x = x; event.m_y = y;
- event.m_shiftDown = ((flags & MK_SHIFT) != 0);
- event.m_controlDown = ((flags & MK_CONTROL) != 0);
- event.m_leftDown = ((flags & MK_LBUTTON) != 0);
- event.m_middleDown = ((flags & MK_MBUTTON) != 0);
- event.m_rightDown = ((flags & MK_RBUTTON) != 0);
- event.SetTimestamp(wxApp::sm_lastMessageTime);
- event.SetEventObject( this );
-
- // Window gets a click down message followed by a mouse move
- // message even if position isn't changed! We want to discard
- // the trailing move event if x and y are the same.
- if ((m_lastEvent == wxEVT_RIGHT_DOWN || m_lastEvent == wxEVT_LEFT_DOWN ||
- m_lastEvent == wxEVT_MIDDLE_DOWN) &&
- (m_lastXPos == event.GetX() && m_lastYPos == event.GetY()))
- {
- m_lastXPos = event.GetX(); m_lastYPos = event.GetY();
- m_lastEvent = wxEVT_MOTION;
- return;
- }
-
- m_lastEvent = wxEVT_MOTION;
- m_lastXPos = event.GetX(); m_lastYPos = event.GetY();
-
- if (!GetEventHandler()->ProcessEvent(event))
- Default();
+ return wxControlBase::GetDefaultBorder();
}
-long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+// This is a helper for all wxControls made with UPDOWN native control.
+// In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
+// WinCE of Smartphones this happens also for native wxTextCtrl,
+// wxChoice and others.
+wxSize wxControl::GetBestSpinnerSize(const bool is_vertical) const
{
- return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
+ // take size according to layout
+ wxSize bestSize(
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+ 0,GetCharHeight()
+#else
+ ::GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL),
+ ::GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL)
+#endif
+ );
+
+ // correct size as for undocumented MSW variants cases (WinCE and perhaps others)
+ if (bestSize.x==0)
+ bestSize.x = bestSize.y;
+ if (bestSize.y==0)
+ bestSize.y = bestSize.x;
+
+ // double size according to layout
+ if (is_vertical)
+ bestSize.y *= 2;
+ else
+ bestSize.x *= 2;
+
+ return bestSize;
}
-bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
- WXLPARAM* WXUNUSED(result))
+/* static */ wxVisualAttributes
+wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
-#if defined(__WIN95__)
- wxCommandEvent event(wxEVT_NULL, m_windowId);
- wxEventType eventType = wxEVT_NULL;
- NMHDR *hdr1 = (NMHDR*) lParam;
- switch ( hdr1->code )
- {
- case NM_CLICK:
- {
- eventType = wxEVT_COMMAND_LEFT_CLICK;
- break;
- }
- case NM_DBLCLK:
- {
- eventType = wxEVT_COMMAND_LEFT_DCLICK;
- break;
- }
- case NM_RCLICK:
- {
- eventType = wxEVT_COMMAND_RIGHT_CLICK;
- break;
- }
- case NM_RDBLCLK:
- {
- eventType = wxEVT_COMMAND_RIGHT_DCLICK;
- break;
- }
- case NM_SETFOCUS:
- {
- eventType = wxEVT_COMMAND_SET_FOCUS;
- break;
- }
- case NM_KILLFOCUS:
- {
- eventType = wxEVT_COMMAND_KILL_FOCUS;
- break;
- }
- case NM_RETURN:
- {
- eventType = wxEVT_COMMAND_ENTER;
- break;
- }
-/* Not implemented
- case NM_OUTOFMEMORY:
- {
- eventType = wxEVT_COMMAND_OUT_OF_MEMORY;
- break;
- }
-*/
- default:
- return FALSE;
- }
+ wxVisualAttributes attrs;
- event.SetEventType(eventType);
- event.SetEventObject(this);
+ // old school (i.e. not "common") controls use the standard dialog font
+ // by default
+ attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- if ( !GetEventHandler()->ProcessEvent(event) )
- return FALSE;
- return TRUE;
-#else // !Win95
- return FALSE;
-#endif
+ // most, or at least many, of the controls use the same colours as the
+ // buttons -- others will have to override this (and possibly simply call
+ // GetCompositeControlsDefaultAttributes() from their versions)
+ attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT);
+ attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+
+ return attrs;
}
-/*
- * Allocates control IDs within the appropriate range
- */
+// another version for the "composite", i.e. non simple controls
+/* static */ wxVisualAttributes
+wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ wxVisualAttributes attrs;
+ attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+ attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+ attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+
+ return attrs;
+}
+// ----------------------------------------------------------------------------
+// message handling
+// ----------------------------------------------------------------------------
+
+bool wxControl::ProcessCommand(wxCommandEvent& event)
+{
+ return HandleWindowEvent(event);
+}
-int NewControlId(void)
+bool wxControl::MSWOnNotify(int idCtrl,
+ WXLPARAM lParam,
+ WXLPARAM* result)
{
- static int controlId = 0;
- controlId ++;
- return controlId;
+ wxEventType eventType wxDUMMY_INITIALIZE(wxEVT_NULL);
+
+ NMHDR *hdr = (NMHDR*) lParam;
+ switch ( hdr->code )
+ {
+ case NM_CLICK:
+ eventType = wxEVT_COMMAND_LEFT_CLICK;
+ break;
+
+ case NM_DBLCLK:
+ eventType = wxEVT_COMMAND_LEFT_DCLICK;
+ break;
+
+ case NM_RCLICK:
+ eventType = wxEVT_COMMAND_RIGHT_CLICK;
+ break;
+
+ case NM_RDBLCLK:
+ eventType = wxEVT_COMMAND_RIGHT_DCLICK;
+ break;
+
+ case NM_SETFOCUS:
+ eventType = wxEVT_COMMAND_SET_FOCUS;
+ break;
+
+ case NM_KILLFOCUS:
+ eventType = wxEVT_COMMAND_KILL_FOCUS;
+ break;
+
+ case NM_RETURN:
+ eventType = wxEVT_COMMAND_ENTER;
+ break;
+
+ default:
+ return wxWindow::MSWOnNotify(idCtrl, lParam, result);
+ }
+
+ wxCommandEvent event(wxEVT_NULL, m_windowId);
+ event.SetEventType(eventType);
+ event.SetEventObject(this);
+
+ return HandleWindowEvent(event);
}
-void wxControl::ProcessCommand (wxCommandEvent & event)
+WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
{
- // Tries:
- // 1) A callback function (to become obsolete)
- // 2) OnCommand, starting at this window and working up parent hierarchy
- // 3) OnCommand then calls ProcessEvent to search the event tables.
- if (m_callback)
+ HDC hdc = (HDC)pDC;
+ if ( m_hasFgCol )
{
- (void) (*(m_callback)) (*this, event);
+ ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
}
- else
+
+ WXHBRUSH hbr = 0;
+ if ( !colBg.Ok() )
+ {
+ hbr = MSWGetBgBrush(pDC, hWnd);
+
+ // if the control doesn't have any bg colour, foreground colour will be
+ // ignored as the return value would be 0 -- so forcefully give it a
+ // non default background brush in this case
+ if ( !hbr && m_hasFgCol )
+ colBg = GetBackgroundColour();
+ }
+
+ // use the background colour override if a valid colour is given
+ if ( colBg.Ok() )
+ {
+ ::SetBkColor(hdc, wxColourToRGB(colBg));
+
+ // draw children with the same colour as the parent
+ wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg,
+ wxBRUSHSTYLE_SOLID);
+ hbr = (WXHBRUSH)brush->GetResourceHandle();
+ }
+
+ // if we use custom background, we should set foreground ourselves too
+ if ( hbr && !m_hasFgCol )
{
- GetEventHandler()->OnCommand(*this, event);
+ ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
}
+ //else: already set above
+
+ return hbr;
}
-void wxControl::OnEraseBackground(wxEraseEvent& event)
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd)
{
- // In general, you don't want to erase the background of a control,
- // or you'll get a flicker.
- // TODO: move this 'null' function into each control that
- // might flicker.
+ wxColour colBg;
- RECT rect;
- ::GetClientRect((HWND) GetHWND(), &rect);
+ if ( HasTransparentBackground() )
+ ::SetBkMode((HDC)pDC, TRANSPARENT);
+ else // if the control is opaque it shouldn't use the parents background
+ colBg = GetBackgroundColour();
- HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
- int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
+ return DoMSWControlColor(pDC, colBg, hWnd);
+}
- ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
- ::DeleteObject(hBrush);
- ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
+WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
+{
+ return DoMSWControlColor(pDC,
+ wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE),
+ GetHWND());
}
-void wxControl::SetClientSize (int width, int height)
+// ----------------------------------------------------------------------------
+// wxControlWithItems
+// ----------------------------------------------------------------------------
+
+void wxControlWithItems::MSWAllocStorage(const wxArrayStringsAdapter& items,
+ unsigned wm)
{
- SetSize (-1, -1, width, height);
+ const unsigned numItems = items.GetCount();
+ unsigned long totalTextLength = numItems; // for trailing '\0' characters
+ for ( unsigned i = 0; i < numItems; ++i )
+ {
+ totalTextLength += items[i].length();
+ }
+
+ if ( SendMessage((HWND)MSWGetItemsHWND(), wm, numItems,
+ (LPARAM)totalTextLength*sizeof(wxChar)) == LB_ERRSPACE )
+ {
+ wxLogLastError(wxT("SendMessage(XX_INITSTORAGE)"));
+ }
}
-void wxControl::Centre (int direction)
+int wxControlWithItems::MSWInsertOrAppendItem(unsigned pos,
+ const wxString& item,
+ unsigned wm)
{
- int x, y, width, height, panel_width, panel_height, new_x, new_y;
+ LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos,
+ (LPARAM)item.wx_str());
+ if ( n == CB_ERR || n == CB_ERRSPACE )
+ {
+ wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)"));
+ return wxNOT_FOUND;
+ }
- wxWindow *parent = (wxWindow *) GetParent ();
- if (!parent)
- return;
+ return n;
+}
- parent->GetClientSize (&panel_width, &panel_height);
- GetSize (&width, &height);
- GetPosition (&x, &y);
+// ---------------------------------------------------------------------------
+// global functions
+// ---------------------------------------------------------------------------
- new_x = x;
- new_y = y;
+// this is used in radiobox.cpp and slider95.cpp and should be removed as soon
+// as it is not needed there any more!
+//
+// Call this repeatedly for several wnds to find the overall size
+// of the widget.
+// Call it initially with wxDefaultCoord for all values in rect.
+// Keep calling for other widgets, and rect will be modified
+// to calculate largest bounding rectangle.
+void wxFindMaxSize(WXHWND wnd, RECT *rect)
+{
+ int left = rect->left;
+ int right = rect->right;
+ int top = rect->top;
+ int bottom = rect->bottom;
- if (direction & wxHORIZONTAL)
- new_x = (int) ((panel_width - width) / 2);
+ GetWindowRect((HWND) wnd, rect);
- if (direction & wxVERTICAL)
- new_y = (int) ((panel_height - height) / 2);
+ if (left < 0)
+ return;
- SetSize (new_x, new_y, width, height);
- int temp_x, temp_y;
- GetPosition (&temp_x, &temp_y);
- GetPosition (&temp_x, &temp_y);
-}
+ if (left < rect->left)
+ rect->left = left;
+
+ if (right > rect->right)
+ rect->right = right;
+ if (top < rect->top)
+ rect->top = top;
+
+ if (bottom > rect->bottom)
+ rect->bottom = bottom;
+}
+#endif // wxUSE_CONTROLS
projects / wxWidgets.git / blobdiff