Move private wxSpinCtrl helpers into a private header
Np real changes, just don't put these functions in the public wx/spinctrl.h, they have nothing to do there.
This commit is contained in:
27
include/wx/private/spinctrl.h
Normal file
27
include/wx/private/spinctrl.h
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Name: wx/private/spinctrl.h
|
||||||
|
// Purpose: Private functions used in wxSpinCtrl implementation.
|
||||||
|
// Author: Vadim Zeitlin
|
||||||
|
// Created: 2019-11-13
|
||||||
|
// Copyright: (c) 2019 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||||
|
// Licence: wxWindows licence
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#ifndef _WX_PRIVATE_SPINCTRL_H_
|
||||||
|
#define _WX_PRIVATE_SPINCTRL_H_
|
||||||
|
|
||||||
|
namespace wxPrivate
|
||||||
|
{
|
||||||
|
|
||||||
|
// This is an internal helper function currently used by all ports: return the
|
||||||
|
// string containing hexadecimal representation of the given number.
|
||||||
|
extern wxString wxSpinCtrlFormatAsHex(long val, long maxVal);
|
||||||
|
|
||||||
|
// The helper function to determine the best size for the given control.
|
||||||
|
// We can't implement this function in the wxSpinCtrlBase because MSW implementation
|
||||||
|
// of wxSpinCtrl is derived from wxSpinButton but uses the same algorithm.
|
||||||
|
extern wxSize wxSpinCtrlGetBestSize(const wxControl* spin, int minVal, int maxVal, int base);
|
||||||
|
|
||||||
|
} // namespace wxPrivate
|
||||||
|
|
||||||
|
#endif // _WX_PRIVATE_SPINCTRL_H_
|
@@ -136,19 +136,6 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
|
|||||||
#if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)
|
#if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)
|
||||||
#include "wx/generic/spinctlg.h"
|
#include "wx/generic/spinctlg.h"
|
||||||
#endif
|
#endif
|
||||||
namespace wxPrivate
|
|
||||||
{
|
|
||||||
|
|
||||||
// This is an internal helper function currently used by all ports: return the
|
|
||||||
// string containing hexadecimal representation of the given number.
|
|
||||||
extern wxString wxSpinCtrlFormatAsHex(long val, long maxVal);
|
|
||||||
|
|
||||||
// The helper function to determine the best size for the given control.
|
|
||||||
// We can't implement this function in the wxSpinCtrlBase because MSW implementation
|
|
||||||
// of wxSpinCtrl is derived from wxSpinButton but uses the same algorithm.
|
|
||||||
extern wxSize wxSpinCtrlGetBestSize(const wxControl* spin, int minVal, int maxVal, int base);
|
|
||||||
|
|
||||||
} // namespace wxPrivate
|
|
||||||
|
|
||||||
// old wxEVT_COMMAND_* constants
|
// old wxEVT_COMMAND_* constants
|
||||||
#define wxEVT_COMMAND_SPINCTRL_UPDATED wxEVT_SPINCTRL
|
#define wxEVT_COMMAND_SPINCTRL_UPDATED wxEVT_SPINCTRL
|
||||||
|
@@ -25,6 +25,8 @@
|
|||||||
#include "wx/spinbutt.h"
|
#include "wx/spinbutt.h"
|
||||||
#include "wx/spinctrl.h"
|
#include "wx/spinctrl.h"
|
||||||
|
|
||||||
|
#include "wx/private/spinctrl.h"
|
||||||
|
|
||||||
#if wxUSE_SPINCTRL
|
#if wxUSE_SPINCTRL
|
||||||
|
|
||||||
wxDEFINE_EVENT(wxEVT_SPINCTRL, wxSpinEvent);
|
wxDEFINE_EVENT(wxEVT_SPINCTRL, wxSpinEvent);
|
||||||
|
@@ -32,6 +32,8 @@
|
|||||||
|
|
||||||
#if wxUSE_SPINCTRL
|
#if wxUSE_SPINCTRL
|
||||||
|
|
||||||
|
#include "wx/private/spinctrl.h"
|
||||||
|
|
||||||
wxIMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent);
|
wxIMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent);
|
||||||
|
|
||||||
// There are port-specific versions for the wxSpinCtrl, so exclude the
|
// There are port-specific versions for the wxSpinCtrl, so exclude the
|
||||||
|
@@ -20,6 +20,8 @@
|
|||||||
#include "wx/wxcrtvararg.h"
|
#include "wx/wxcrtvararg.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "wx/private/spinctrl.h"
|
||||||
|
|
||||||
#include "wx/gtk/private.h"
|
#include "wx/gtk/private.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
@@ -21,6 +21,8 @@
|
|||||||
#include "wx/crt.h"
|
#include "wx/crt.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "wx/private/spinctrl.h"
|
||||||
|
|
||||||
#include "wx/gtk1/private.h"
|
#include "wx/gtk1/private.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
@@ -35,6 +35,8 @@
|
|||||||
#include "wx/wxcrtvararg.h"
|
#include "wx/wxcrtvararg.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "wx/private/spinctrl.h"
|
||||||
|
|
||||||
#include "wx/msw/private.h"
|
#include "wx/msw/private.h"
|
||||||
#include "wx/msw/private/winstyle.h"
|
#include "wx/msw/private/winstyle.h"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user