Include wx/slider.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: cocoa/slider.mm
|
// Name: src/cocoa/slider.mm
|
||||||
// Purpose: wxSlider
|
// Purpose: wxSlider
|
||||||
// Author: David Elliott
|
// Author: David Elliott
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -10,17 +10,19 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
#if wxUSE_SLIDER
|
||||||
|
|
||||||
|
#include "wx/slider.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/slider.h"
|
|
||||||
#endif //WX_PRECOMP
|
#endif //WX_PRECOMP
|
||||||
|
|
||||||
#import <AppKit/NSSlider.h>
|
#import <AppKit/NSSlider.h>
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
|
IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
|
||||||
BEGIN_EVENT_TABLE(wxSlider, wxSliderBase)
|
BEGIN_EVENT_TABLE(wxSlider, wxSliderBase)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
// WX_IMPLEMENT_COCOA_OWNER(wxSlider,NSSlider,NSControl,NSView)
|
// WX_IMPLEMENT_COCOA_OWNER(wxSlider,NSSlider,NSControl,NSView)
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: generic/colrdlgg.cpp
|
// Name: src/generic/colrdlgg.cpp
|
||||||
// Purpose: Choice dialogs
|
// Purpose: Choice dialogs
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -28,16 +28,13 @@
|
|||||||
#include "wx/layout.h"
|
#include "wx/layout.h"
|
||||||
#include "wx/dcclient.h"
|
#include "wx/dcclient.h"
|
||||||
#include "wx/sizer.h"
|
#include "wx/sizer.h"
|
||||||
|
#include "wx/slider.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_STATLINE
|
#if wxUSE_STATLINE
|
||||||
#include "wx/statline.h"
|
#include "wx/statline.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
|
||||||
#include "wx/slider.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "wx/generic/colrdlgg.h"
|
#include "wx/generic/colrdlgg.h"
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
|
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
|
||||||
|
@@ -27,11 +27,12 @@
|
|||||||
|
|
||||||
#if wxUSE_SLIDER
|
#if wxUSE_SLIDER
|
||||||
|
|
||||||
|
#include "wx/slider.h"
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/brush.h"
|
#include "wx/brush.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/slider.h"
|
|
||||||
#include "wx/msw/subwin.h"
|
#include "wx/msw/subwin.h"
|
||||||
|
|
||||||
// include <commctrl.h> "properly"
|
// include <commctrl.h> "properly"
|
||||||
|
@@ -37,11 +37,11 @@
|
|||||||
#include "wx/button.h"
|
#include "wx/button.h"
|
||||||
#include "wx/checkbox.h"
|
#include "wx/checkbox.h"
|
||||||
#include "wx/radiobut.h"
|
#include "wx/radiobut.h"
|
||||||
|
#include "wx/slider.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/toplevel.h"
|
#include "wx/toplevel.h"
|
||||||
#include "wx/tglbtn.h"
|
#include "wx/tglbtn.h"
|
||||||
#include "wx/slider.h"
|
|
||||||
|
|
||||||
#include <Control.h>
|
#include <Control.h>
|
||||||
#include <Form.h>
|
#include <Form.h>
|
||||||
|
@@ -18,10 +18,11 @@
|
|||||||
|
|
||||||
#if wxUSE_SLIDER
|
#if wxUSE_SLIDER
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
|
||||||
#include "wx/utils.h"
|
|
||||||
#include "wx/brush.h"
|
|
||||||
#include "wx/slider.h"
|
#include "wx/slider.h"
|
||||||
|
|
||||||
|
#ifndef WX_PRECOMP
|
||||||
|
#include "wx/utils.h"
|
||||||
|
#include "wx/brush.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/toplevel.h"
|
#include "wx/toplevel.h"
|
||||||
|
@@ -36,6 +36,7 @@
|
|||||||
#include "wx/button.h"
|
#include "wx/button.h"
|
||||||
#include "wx/checkbox.h"
|
#include "wx/checkbox.h"
|
||||||
#include "wx/radiobut.h"
|
#include "wx/radiobut.h"
|
||||||
|
#include "wx/slider.h"
|
||||||
#endif //WX_PRECOMP
|
#endif //WX_PRECOMP
|
||||||
|
|
||||||
#include "wx/module.h"
|
#include "wx/module.h"
|
||||||
@@ -43,7 +44,6 @@
|
|||||||
|
|
||||||
// controls for sending select event
|
// controls for sending select event
|
||||||
#include "wx/tglbtn.h"
|
#include "wx/tglbtn.h"
|
||||||
#include "wx/slider.h"
|
|
||||||
#include "wx/datectrl.h"
|
#include "wx/datectrl.h"
|
||||||
|
|
||||||
#include <Window.h>
|
#include <Window.h>
|
||||||
|
@@ -48,13 +48,13 @@
|
|||||||
#pragma hdrstop
|
#pragma hdrstop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#if wxUSE_SLIDER
|
||||||
#include "wx/dc.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "wx/slider.h"
|
#include "wx/slider.h"
|
||||||
|
|
||||||
#if wxUSE_SLIDER
|
#ifndef WX_PRECOMP
|
||||||
|
#include "wx/dc.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/univ/renderer.h"
|
#include "wx/univ/renderer.h"
|
||||||
#include "wx/univ/inphand.h"
|
#include "wx/univ/inphand.h"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: xh_slidr.cpp
|
// Name: src/xrc/xh_slidr.cpp
|
||||||
// Purpose: XRC resource for wxSlider
|
// Purpose: XRC resource for wxSlider
|
||||||
// Author: Bob Mitchell
|
// Author: Bob Mitchell
|
||||||
// Created: 2000/03/21
|
// Created: 2000/03/21
|
||||||
@@ -18,12 +18,15 @@
|
|||||||
#if wxUSE_XRC && wxUSE_SLIDER
|
#if wxUSE_XRC && wxUSE_SLIDER
|
||||||
|
|
||||||
#include "wx/xrc/xh_slidr.h"
|
#include "wx/xrc/xh_slidr.h"
|
||||||
#include "wx/slider.h"
|
|
||||||
|
#ifndef WX_PRECOMP
|
||||||
|
#include "wx/slider.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
|
IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
|
||||||
|
|
||||||
wxSliderXmlHandler::wxSliderXmlHandler()
|
wxSliderXmlHandler::wxSliderXmlHandler()
|
||||||
: wxXmlResourceHandler()
|
:wxXmlResourceHandler()
|
||||||
{
|
{
|
||||||
XRC_ADD_STYLE(wxSL_HORIZONTAL);
|
XRC_ADD_STYLE(wxSL_HORIZONTAL);
|
||||||
XRC_ADD_STYLE(wxSL_VERTICAL);
|
XRC_ADD_STYLE(wxSL_VERTICAL);
|
||||||
|
Reference in New Issue
Block a user