merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,7 +21,7 @@ class wxBoundingBox
|
||||
{
|
||||
public:
|
||||
wxBoundingBox();
|
||||
wxBoundingBox(wxBoundingBox&);
|
||||
wxBoundingBox(const wxBoundingBox&);
|
||||
wxBoundingBox(const wxPoint2DDouble&);
|
||||
wxBoundingBox(double xmin, double ymin, double xmax, double ymax);
|
||||
|
||||
|
@@ -26,7 +26,7 @@ antiflicker plugins within the application.
|
||||
Locking for multithreaded applications is not yet implemented.
|
||||
*/
|
||||
|
||||
class cbAntiflickerPlugin : public cbPluginBase
|
||||
class WXFL_DECLSPEC cbAntiflickerPlugin : public cbPluginBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbAntiflickerPlugin )
|
||||
protected:
|
||||
|
@@ -23,7 +23,7 @@
|
||||
Plugin class implementing bar dragging.
|
||||
*/
|
||||
|
||||
class cbBarDragPlugin : public cbPluginBase
|
||||
class WXFL_DECLSPEC cbBarDragPlugin : public cbPluginBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbBarDragPlugin )
|
||||
protected:
|
||||
|
@@ -24,7 +24,7 @@ This class intercepts bar-decoration and sizing events, and draws 3D hints
|
||||
around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x
|
||||
*/
|
||||
|
||||
class cbBarHintsPlugin : public cbPluginBase
|
||||
class WXFL_DECLSPEC cbBarHintsPlugin : public cbPluginBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbBarHintsPlugin )
|
||||
|
||||
|
@@ -24,7 +24,7 @@ menu and handling basic customization such as floating
|
||||
and horizontal/vertical alignment of the bar.
|
||||
*/
|
||||
|
||||
class cbSimpleCustomizationPlugin : public cbPluginBase
|
||||
class WXFL_DECLSPEC cbSimpleCustomizationPlugin : public cbPluginBase
|
||||
{
|
||||
public:
|
||||
DECLARE_DYNAMIC_CLASS( cbSimpleCustomizationPlugin )
|
||||
|
@@ -21,30 +21,31 @@
|
||||
#include "wx/string.h"
|
||||
#include "wx/window.h"
|
||||
#include "wx/dynarray.h"
|
||||
#include "wx/fl/fldefs.h"
|
||||
|
||||
#define WXCONTROLBAR_VERSION 1.3
|
||||
|
||||
// forward declarations
|
||||
|
||||
class wxFrameLayout;
|
||||
class WXFL_DECLSPEC wxFrameLayout;
|
||||
|
||||
class cbDockPane;
|
||||
class cbUpdatesManagerBase;
|
||||
class cbBarDimHandlerBase;
|
||||
class cbPluginBase;
|
||||
class cbPluginEvent;
|
||||
class cbPaneDrawPlugin;
|
||||
class WXFL_DECLSPEC cbDockPane;
|
||||
class WXFL_DECLSPEC cbUpdatesManagerBase;
|
||||
class WXFL_DECLSPEC cbBarDimHandlerBase;
|
||||
class WXFL_DECLSPEC cbPluginBase;
|
||||
class WXFL_DECLSPEC cbPluginEvent;
|
||||
class WXFL_DECLSPEC cbPaneDrawPlugin;
|
||||
|
||||
class cbBarInfo;
|
||||
class cbRowInfo;
|
||||
class cbDimInfo;
|
||||
class cbCommonPaneProperties;
|
||||
class WXFL_DECLSPEC cbBarInfo;
|
||||
class WXFL_DECLSPEC cbRowInfo;
|
||||
class WXFL_DECLSPEC cbDimInfo;
|
||||
class WXFL_DECLSPEC cbCommonPaneProperties;
|
||||
|
||||
typedef cbBarInfo* BarInfoPtrT;
|
||||
typedef cbRowInfo* RowInfoPtrT;
|
||||
|
||||
WX_DEFINE_ARRAY( BarInfoPtrT, BarArrayT );
|
||||
WX_DEFINE_ARRAY( RowInfoPtrT, RowArrayT );
|
||||
WXFL_DEFINE_ARRAY( BarInfoPtrT, BarArrayT );
|
||||
WXFL_DEFINE_ARRAY( RowInfoPtrT, RowArrayT );
|
||||
|
||||
// control bar states
|
||||
|
||||
@@ -97,7 +98,7 @@ Helper class, used for spying for unhandled mouse events on control bars
|
||||
and forwarding them to the frame layout.
|
||||
*/
|
||||
|
||||
class cbBarSpy : public wxEvtHandler
|
||||
class WXFL_DECLSPEC cbBarSpy : public wxEvtHandler
|
||||
{
|
||||
public:
|
||||
DECLARE_DYNAMIC_CLASS( cbBarSpy )
|
||||
@@ -129,7 +130,7 @@ which can be docked along the top, bottom, right, or left side of the
|
||||
parent frame.
|
||||
*/
|
||||
|
||||
class wxFrameLayout : public wxEvtHandler
|
||||
class WXFL_DECLSPEC wxFrameLayout : public wxEvtHandler
|
||||
{
|
||||
public:
|
||||
// Default constructor, used only for serialization.
|
||||
@@ -647,7 +648,7 @@ used by any particular updates-manager to store
|
||||
auxiliary information to be used by its updating algorithm.
|
||||
*/
|
||||
|
||||
class cbUpdateMgrData : public wxObject
|
||||
class WXFL_DECLSPEC cbUpdateMgrData : public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbUpdateMgrData )
|
||||
public:
|
||||
@@ -687,7 +688,7 @@ to adjust the values in cbDimInfo::mSizes accordingly.
|
||||
Specific handlers can be hooked up to specific types of bar.
|
||||
*/
|
||||
|
||||
class cbBarDimHandlerBase : public wxObject
|
||||
class WXFL_DECLSPEC cbBarDimHandlerBase : public wxObject
|
||||
{
|
||||
DECLARE_ABSTRACT_CLASS( cbBarDimHandlerBase )
|
||||
|
||||
@@ -725,7 +726,7 @@ Helper class used internally by the wxFrameLayout class.
|
||||
Holds and manages information about bar dimensions.
|
||||
*/
|
||||
|
||||
class cbDimInfo : public wxObject
|
||||
class WXFL_DECLSPEC cbDimInfo : public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbDimInfo )
|
||||
public:
|
||||
@@ -824,7 +825,7 @@ public:
|
||||
};
|
||||
|
||||
// FIXME: this array definition compiles but probably doesn't do what was intended (GD)
|
||||
WX_DEFINE_ARRAY_LONG(float, cbArrayFloat);
|
||||
WXFL_DEFINE_ARRAY_LONG(float, cbArrayFloat);
|
||||
|
||||
/*
|
||||
Helper class used internally by the wxFrameLayout class.
|
||||
|
@@ -18,12 +18,13 @@
|
||||
|
||||
#include "wx/tbarbase.h"
|
||||
#include "wx/dynarray.h"
|
||||
#include "wx/fl/fldefs.h"
|
||||
|
||||
/*
|
||||
Tool layout item.
|
||||
*/
|
||||
|
||||
class wxToolLayoutItem : public wxObject
|
||||
class WXFL_DECLSPEC wxToolLayoutItem : public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
|
||||
|
||||
@@ -32,19 +33,19 @@ public:
|
||||
bool mIsSeparator;
|
||||
};
|
||||
|
||||
class wxDynToolInfo;
|
||||
class WXFL_DECLSPEC wxDynToolInfo;
|
||||
|
||||
typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
|
||||
typedef wxDynToolInfo* wxDynToolInfoPtrT;
|
||||
|
||||
WX_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT );
|
||||
WX_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT );
|
||||
WXFL_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT );
|
||||
WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT );
|
||||
|
||||
/*
|
||||
This is a base class for layout algorithm implementations.
|
||||
*/
|
||||
|
||||
class LayoutManagerBase
|
||||
class WXFL_DECLSPEC LayoutManagerBase
|
||||
{
|
||||
public:
|
||||
// Constructor.
|
||||
@@ -63,7 +64,7 @@ BagLayout lays out items in left-to-right order from
|
||||
top to bottom.
|
||||
*/
|
||||
|
||||
class BagLayout : public LayoutManagerBase
|
||||
class WXFL_DECLSPEC BagLayout : public LayoutManagerBase
|
||||
{
|
||||
public:
|
||||
// Constructor.
|
||||
@@ -78,7 +79,7 @@ public:
|
||||
This class holds dynamic toolbar item information.
|
||||
*/
|
||||
|
||||
class wxDynToolInfo : public wxToolLayoutItem
|
||||
class WXFL_DECLSPEC wxDynToolInfo : public wxToolLayoutItem
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
|
||||
|
||||
@@ -98,7 +99,7 @@ public:
|
||||
wxDynamicToolBar manages containment and layout of tool windows.
|
||||
*/
|
||||
|
||||
class wxDynamicToolBar : public wxToolBarBase
|
||||
class WXFL_DECLSPEC wxDynamicToolBar : public wxToolBarBase
|
||||
{
|
||||
protected:
|
||||
friend class wxDynamicToolBarSerializer;
|
||||
|
@@ -23,7 +23,7 @@
|
||||
Dynamic toolbar dimension handler.
|
||||
*/
|
||||
|
||||
class cbDynToolBarDimHandler : public cbBarDimHandlerBase
|
||||
class WXFL_DECLSPEC cbDynToolBarDimHandler : public cbBarDimHandlerBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbDynToolBarDimHandler )
|
||||
public:
|
||||
|
50
contrib/include/wx/fl/fldefs.h
Normal file
50
contrib/include/wx/fl/fldefs.h
Normal file
@@ -0,0 +1,50 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: fldefs.h
|
||||
// Purpose: Declaration of global types and defines.
|
||||
// Author: David M. Falkinder (david_falkinder@hp.com)
|
||||
// Modified by:
|
||||
// Created: 18/09/2002
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) David M. Falkinder
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef __fldefs_H_INCLUDED__
|
||||
#define __fldefs_H_INCLUDED__
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
/*
|
||||
* If we're using wx in Dynamic Library format do we
|
||||
* want FL to be in DLL form as well?
|
||||
*/
|
||||
#if defined(WXUSINGDLL) && \
|
||||
(defined(WXMAKING_FL_DLL) || defined(WXUSING_FL_DLL))
|
||||
|
||||
#if defined(WXMAKING_FL_DLL)
|
||||
// When building the DLL WXFLDECLSPEC exports classes
|
||||
# define WXFL_DECLSPEC WXEXPORT
|
||||
#elif defined(WXUSING_FL_DLL)
|
||||
// When building the DLL WXFLDECLSPEC imports classes
|
||||
# define WXFL_DECLSPEC WXIMPORT
|
||||
#endif // defined(WXBUILD_FL_DLL)
|
||||
|
||||
#else
|
||||
// When building the static library nullify the effect of WXFL_DECLSPEC
|
||||
#define WXFL_DECLSPEC
|
||||
#endif // WXUSINGDLL && (WXMAKING_FL_DLL || WXUSING_FL_DLL)
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Override some of the wxArray functions to
|
||||
// include our definitions
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
#define WXFL_DEFINE_ARRAY(c,l) \
|
||||
class WXFL_DECLSPEC l; \
|
||||
WX_DEFINE_ARRAY(c,l)
|
||||
|
||||
#define WXFL_DEFINE_ARRAY_LONG(t,l) \
|
||||
class WXFL_DECLSPEC l; \
|
||||
WX_DEFINE_ARRAY_LONG(t,l)
|
||||
|
||||
|
||||
#endif // __fldefs_H_INCLUDED__
|
@@ -32,7 +32,7 @@ class wxFrameManager;
|
||||
It is not clear what this class does. It is not used elsewhere in FL.
|
||||
*/
|
||||
|
||||
class wxFrameView : public wxEvtHandler
|
||||
class WXFL_DECLSPEC wxFrameView : public wxEvtHandler
|
||||
{
|
||||
protected:
|
||||
wxStringList mTopMenus;
|
||||
@@ -87,7 +87,7 @@ class wxFrame;
|
||||
It is not clear what this class does. It is not used elsewhere in FL.
|
||||
*/
|
||||
|
||||
class wxFrameManager : wxObject
|
||||
class WXFL_DECLSPEC wxFrameManager : wxObject
|
||||
{
|
||||
protected:
|
||||
wxList mViews;
|
||||
|
@@ -17,6 +17,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/list.h"
|
||||
#include "wx/fl/fldefs.h"
|
||||
|
||||
struct GCItem
|
||||
{
|
||||
@@ -33,7 +34,7 @@ inline void* gc_node_to_obj( wxNode* pGCNode )
|
||||
This class implements an extremely slow but simple garbage collection algorithm.
|
||||
*/
|
||||
|
||||
class GarbageCollector
|
||||
class WXFL_DECLSPEC GarbageCollector
|
||||
{
|
||||
protected:
|
||||
wxList mAllNodes;
|
||||
|
@@ -93,7 +93,7 @@ to avoid dirty non-client areas of moved windows
|
||||
in some special cases of 'overlapping anomalies'.
|
||||
*/
|
||||
|
||||
class cbGCUpdatesMgr : public cbSimpleUpdatesMgr
|
||||
class WXFL_DECLSPEC cbGCUpdatesMgr : public cbSimpleUpdatesMgr
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbGCUpdatesMgr )
|
||||
protected:
|
||||
|
@@ -20,13 +20,13 @@
|
||||
|
||||
#include "wx/timer.h"
|
||||
|
||||
class cbHintAnimTimer;
|
||||
class WXFL_DECLSPEC cbHintAnimTimer;
|
||||
|
||||
/*
|
||||
A plugin to draw animated hints when the user drags a pane.
|
||||
*/
|
||||
|
||||
class cbHintAnimationPlugin : public cbPluginBase
|
||||
class WXFL_DECLSPEC cbHintAnimationPlugin : public cbPluginBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbHintAnimationPlugin )
|
||||
protected:
|
||||
@@ -101,7 +101,7 @@ public:
|
||||
A private helper class.
|
||||
*/
|
||||
|
||||
struct MorphInfoT
|
||||
struct WXFL_DECLSPEC MorphInfoT
|
||||
{
|
||||
wxPoint mFrom;
|
||||
wxPoint mTill;
|
||||
@@ -111,7 +111,7 @@ struct MorphInfoT
|
||||
A private helper class.
|
||||
*/
|
||||
|
||||
class cbHintAnimTimer : public wxTimer
|
||||
class WXFL_DECLSPEC cbHintAnimTimer : public wxTimer
|
||||
{
|
||||
protected:
|
||||
|
||||
|
@@ -18,6 +18,7 @@
|
||||
|
||||
#include "wx/button.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/fl/fldefs.h"
|
||||
|
||||
// defaults
|
||||
#define NB_DEFAULT_MARGIN 2
|
||||
@@ -31,8 +32,8 @@
|
||||
|
||||
// classes declared in this header file
|
||||
|
||||
class wxNewBitmapButton;
|
||||
class wxBorderLessBitmapButton;
|
||||
class WXFL_DECLSPEC wxNewBitmapButton;
|
||||
class WXFL_DECLSPEC wxBorderLessBitmapButton;
|
||||
|
||||
/*
|
||||
This is an alternative class to wxBitmapButton. It is used
|
||||
@@ -194,11 +195,6 @@ public:
|
||||
// Responds to a kill focus event.
|
||||
void OnKillFocus( wxFocusEvent& event );
|
||||
|
||||
// Maps bitmap to current system colours on Windows
|
||||
#ifdef __WXMSW__
|
||||
WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
|
||||
#endif
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
|
@@ -27,7 +27,7 @@ would be enough for the frame layout to function properly
|
||||
(they are plugged in automatically by the wxFrameLayout class).
|
||||
*/
|
||||
|
||||
class cbPaneDrawPlugin : public cbPluginBase
|
||||
class WXFL_DECLSPEC cbPaneDrawPlugin : public cbPluginBase
|
||||
{
|
||||
public:
|
||||
DECLARE_DYNAMIC_CLASS( cbPaneDrawPlugin )
|
||||
|
@@ -25,7 +25,7 @@ The behaviour and appearance resembles drag and drop positioning
|
||||
of the toolbar rows in Netscape Communicator 4.xx.
|
||||
*/
|
||||
|
||||
class cbRowDragPlugin : public cbPluginBase
|
||||
class WXFL_DECLSPEC cbRowDragPlugin : public cbPluginBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbRowDragPlugin )
|
||||
public:
|
||||
@@ -217,7 +217,7 @@ public:
|
||||
Internal helper class.
|
||||
*/
|
||||
|
||||
class cbHiddenBarInfo : public wxObject
|
||||
class WXFL_DECLSPEC cbHiddenBarInfo : public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbHiddenBarInfo )
|
||||
public:
|
||||
|
@@ -23,7 +23,7 @@ Simple implementation of a plugin which handles row layout
|
||||
requests sent from a frame layout.
|
||||
*/
|
||||
|
||||
class cbRowLayoutPlugin : public cbPluginBase
|
||||
class WXFL_DECLSPEC cbRowLayoutPlugin : public cbPluginBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbRowLayoutPlugin )
|
||||
protected:
|
||||
|
@@ -19,6 +19,7 @@
|
||||
|
||||
#include "wx/frame.h"
|
||||
#include "wx/dynarray.h"
|
||||
#include "wx/fl/fldefs.h"
|
||||
|
||||
// fixed settings
|
||||
|
||||
@@ -26,18 +27,18 @@
|
||||
#define BTN_BOX_WIDTH 12
|
||||
#define BTN_X_WIEGHT 2
|
||||
|
||||
class cbMiniButton;
|
||||
class WXFL_DECLSPEC cbMiniButton;
|
||||
|
||||
typedef cbMiniButton* cbMinitButtonPtrT;
|
||||
|
||||
WX_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT );
|
||||
WXFL_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT );
|
||||
|
||||
/*
|
||||
A tool window is a special kind of frame that paints its own title, and
|
||||
can be used to implement small floating windows.
|
||||
*/
|
||||
|
||||
class wxToolWindow : public wxFrame
|
||||
class WXFL_DECLSPEC wxToolWindow : public wxFrame
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( wxToolWindow )
|
||||
|
||||
@@ -221,7 +222,7 @@ public:
|
||||
cbCloseBox is a window close button, used in a wxToolWindow titlebar.
|
||||
*/
|
||||
|
||||
class cbCloseBox : public cbMiniButton
|
||||
class WXFL_DECLSPEC cbCloseBox : public cbMiniButton
|
||||
{
|
||||
public:
|
||||
// Draws the close button appearance.
|
||||
@@ -232,7 +233,7 @@ public:
|
||||
cbCollapseBox is a window collapse button, used in a wxToolWindow titlebar.
|
||||
*/
|
||||
|
||||
class cbCollapseBox : public cbMiniButton
|
||||
class WXFL_DECLSPEC cbCollapseBox : public cbMiniButton
|
||||
{
|
||||
public:
|
||||
bool mIsAtLeft;
|
||||
@@ -245,7 +246,7 @@ public:
|
||||
cbDockBox is a window dock button, used in a wxToolWindow titlebar.
|
||||
*/
|
||||
|
||||
class cbDockBox : public cbMiniButton
|
||||
class WXFL_DECLSPEC cbDockBox : public cbMiniButton
|
||||
{
|
||||
public:
|
||||
// Draws the dock button appearance.
|
||||
@@ -257,7 +258,7 @@ cbFloatedBarWindow is a kind of wxToolWindow,
|
||||
implementing floating toolbars.
|
||||
*/
|
||||
|
||||
class cbFloatedBarWindow : public wxToolWindow
|
||||
class WXFL_DECLSPEC cbFloatedBarWindow : public wxToolWindow
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbFloatedBarWindow )
|
||||
protected:
|
||||
|
@@ -23,7 +23,7 @@ This class implements slightly optimized logic for refreshing
|
||||
the areas of frame layout that actually need to be updated.
|
||||
*/
|
||||
|
||||
class cbSimpleUpdatesMgr : public cbUpdatesManagerBase
|
||||
class WXFL_DECLSPEC cbSimpleUpdatesMgr : public cbUpdatesManagerBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( cbSimpleUpdatesMgr )
|
||||
protected:
|
||||
|
@@ -22,11 +22,6 @@
|
||||
#define DEFAULT_MOUSE_TOLERANCE 3
|
||||
#endif
|
||||
|
||||
// Edit these lines if you positively don't want PROLOGIO support
|
||||
#ifndef PROLOGIO
|
||||
#define PROLOGIO
|
||||
#endif
|
||||
|
||||
// Key identifiers
|
||||
#define KEY_SHIFT 1
|
||||
#define KEY_CTRL 2
|
||||
@@ -110,7 +105,7 @@ class wxControlPoint;
|
||||
class wxShapeRegion;
|
||||
class wxShape;
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
class WXDLLEXPORT wxExpr;
|
||||
class WXDLLEXPORT wxExprDatabase;
|
||||
#endif
|
||||
@@ -381,7 +376,7 @@ class wxShape: public wxShapeEvtHandler
|
||||
virtual void ClearText(int regionId = 0);
|
||||
void RemoveLine(wxLineShape *line);
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
// I/O
|
||||
virtual void WriteAttributes(wxExpr *clause);
|
||||
virtual void ReadAttributes(wxExpr *clause);
|
||||
@@ -613,7 +608,7 @@ class wxPolygonShape: public wxShape
|
||||
// Recalculates the centre of the polygon
|
||||
virtual void CalculatePolygonCentre();
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
void ReadAttributes(wxExpr *clause);
|
||||
#endif
|
||||
@@ -652,7 +647,7 @@ class wxRectangleShape: public wxShape
|
||||
void SetSize(double x, double y, bool recursive = TRUE);
|
||||
void SetCornerRadius(double rad); // If > 0, rounded corners
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
void ReadAttributes(wxExpr *clause);
|
||||
#endif
|
||||
@@ -682,8 +677,8 @@ class wxTextShape: public wxRectangleShape
|
||||
|
||||
void OnDraw(wxDC& dc);
|
||||
|
||||
#ifdef PROLOGIO
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
#if wxUSE_PROLOGIO
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
#endif
|
||||
|
||||
// Does the copying for this object
|
||||
@@ -704,7 +699,7 @@ class wxEllipseShape: public wxShape
|
||||
void OnDraw(wxDC& dc);
|
||||
void SetSize(double x, double y, bool recursive = TRUE);
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
void ReadAttributes(wxExpr *clause);
|
||||
#endif
|
||||
|
@@ -136,7 +136,8 @@ class wxShapeRegion: public wxObject
|
||||
~wxShapeRegion();
|
||||
|
||||
// Accessors
|
||||
inline void SetText(const wxString& s) { m_regionText = s; }
|
||||
inline void SetText(const wxString& s)
|
||||
{ m_regionText = s; m_formattedText.Append(new wxShapeTextLine(0,0,s));}
|
||||
void SetFont(wxFont *f);
|
||||
void SetMinSize(double w, double h);
|
||||
void SetSize(double w, double h);
|
||||
|
@@ -27,7 +27,7 @@ class wxBitmapShape: public wxRectangleShape
|
||||
|
||||
void OnDraw(wxDC& dc);
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
// I/O
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
void ReadAttributes(wxExpr *clause);
|
||||
|
@@ -77,7 +77,7 @@ public:
|
||||
// Calculates size and position of composite object based on children
|
||||
void CalculateSize();
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
void ReadAttributes(wxExpr *clause);
|
||||
// In case the object has constraints it needs to read in in a different pass
|
||||
@@ -152,7 +152,7 @@ class wxDivisionShape: public wxCompositeShape
|
||||
void MakeMandatoryControlPoints();
|
||||
void ResetMandatoryControlPoints();
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
void ReadAttributes(wxExpr *clause);
|
||||
#endif
|
||||
|
@@ -46,7 +46,7 @@ class wxDividedShape: public wxRectangleShape
|
||||
void MakeMandatoryControlPoints();
|
||||
void ResetMandatoryControlPoints();
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
void ReadAttributes(wxExpr *clause);
|
||||
#endif
|
||||
|
@@ -32,7 +32,7 @@ class wxPseudoMetaFile: public wxObject
|
||||
|
||||
void Draw(wxDC& dc, double xoffset, double yoffset);
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
void WriteAttributes(wxExpr *clause, int whichAngle);
|
||||
void ReadAttributes(wxExpr *clause, int whichAngle);
|
||||
#endif
|
||||
@@ -139,7 +139,7 @@ class wxDrawnShape: public wxRectangleShape
|
||||
|
||||
void OnDraw(wxDC& dc);
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
// I/O
|
||||
void WriteAttributes(wxExpr *clause);
|
||||
void ReadAttributes(wxExpr *clause);
|
||||
|
@@ -65,9 +65,10 @@ public:
|
||||
inline virtual void Rotate(double x, double y, double theta, double sinTheta, double cosTheta) {};
|
||||
virtual void Do(wxDC& dc, double xoffset, double yoffset) = 0;
|
||||
virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;
|
||||
#if wxUSE_PROLOGIO
|
||||
virtual wxExpr *WriteExpr(wxPseudoMetaFile *image) = 0;
|
||||
virtual void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;
|
||||
|
||||
#endif
|
||||
inline int GetOp() const { return m_op; }
|
||||
|
||||
// Draw an outline using the current operation. By default, return FALSE (not drawn)
|
||||
@@ -98,8 +99,10 @@ class wxOpSetGDI: public wxDrawOp
|
||||
wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);
|
||||
void Do(wxDC& dc, double xoffset, double yoffset);
|
||||
wxDrawOp *Copy(wxPseudoMetaFile *newImage);
|
||||
#if wxUSE_PROLOGIO
|
||||
wxExpr *WriteExpr(wxPseudoMetaFile *image);
|
||||
void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
|
||||
#endif
|
||||
|
||||
public:
|
||||
int m_mode;
|
||||
@@ -123,8 +126,10 @@ public:
|
||||
void Scale(double xScale, double yScale);
|
||||
void Translate(double x, double y);
|
||||
wxDrawOp *Copy(wxPseudoMetaFile *newImage);
|
||||
#if wxUSE_PROLOGIO
|
||||
wxExpr *WriteExpr(wxPseudoMetaFile *image);
|
||||
void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
|
||||
#endif
|
||||
|
||||
public:
|
||||
double m_x1;
|
||||
@@ -149,8 +154,10 @@ class wxOpDraw: public wxDrawOp
|
||||
void Translate(double x, double y);
|
||||
void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
|
||||
wxDrawOp *Copy(wxPseudoMetaFile *newImage);
|
||||
#if wxUSE_PROLOGIO
|
||||
wxExpr *WriteExpr(wxPseudoMetaFile *image);
|
||||
void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
|
||||
#endif
|
||||
|
||||
public:
|
||||
double m_x1;
|
||||
@@ -179,8 +186,10 @@ public:
|
||||
void Translate(double x, double y);
|
||||
void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
|
||||
wxDrawOp *Copy(wxPseudoMetaFile *newImage);
|
||||
#if wxUSE_PROLOGIO
|
||||
wxExpr *WriteExpr(wxPseudoMetaFile *image);
|
||||
void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
|
||||
#endif
|
||||
|
||||
// Draw an outline using the current operation.
|
||||
virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,
|
||||
|
@@ -188,7 +188,7 @@ class wxLineShape: public wxShape
|
||||
|
||||
bool HitTest(double x, double y, int *attachment, double *distance);
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
// I/O
|
||||
virtual void WriteAttributes(wxExpr *clause);
|
||||
virtual void ReadAttributes(wxExpr *clause);
|
||||
|
@@ -67,7 +67,7 @@ public:
|
||||
// Make sure all text that should be centred, is centred.
|
||||
void RecentreAll(wxDC& dc);
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#if wxUSE_PROLOGIO
|
||||
virtual bool SaveFile(const wxString& filename);
|
||||
virtual bool LoadFile(const wxString& filename);
|
||||
|
||||
|
@@ -24,6 +24,12 @@
|
||||
#include <wx/wx.h>
|
||||
#include <wx/dnd.h>
|
||||
|
||||
#ifdef STCISDLL
|
||||
#define STCDLLEXPORT WXDLLEXPORT
|
||||
#else
|
||||
#define STCDLLEXPORT
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
// Should a wxPopupWindow be used for the call tips and autocomplete windows?
|
||||
@@ -43,12 +49,6 @@
|
||||
#define wxSTC_START 2000
|
||||
#define wxSTC_OPTIONAL_START 3000
|
||||
#define wxSTC_LEXER_START 4000
|
||||
|
||||
// Redoes the next action on the undo history.
|
||||
#define wxSTC_CMD_REDO 2011
|
||||
|
||||
// Select all the text in the document.
|
||||
#define wxSTC_CMD_SELECTALL 2013
|
||||
#define wxSTC_WS_INVISIBLE 0
|
||||
#define wxSTC_WS_VISIBLEALWAYS 1
|
||||
#define wxSTC_WS_VISIBLEAFTERINDENT 2
|
||||
@@ -167,18 +167,6 @@
|
||||
#define wxSTC_FIND_MATCHCASE 4
|
||||
#define wxSTC_FIND_WORDSTART 0x00100000
|
||||
#define wxSTC_FIND_REGEXP 0x00200000
|
||||
|
||||
// Undo one action in the undo history.
|
||||
#define wxSTC_CMD_UNDO 2176
|
||||
|
||||
// Cut the selection to the clipboard.
|
||||
#define wxSTC_CMD_CUT 2177
|
||||
|
||||
// Copy the selection to the clipboard.
|
||||
#define wxSTC_CMD_COPY 2178
|
||||
|
||||
// Paste the contents of the clipboard into the document replacing the selection.
|
||||
#define wxSTC_CMD_PASTE 2179
|
||||
#define wxSTC_FOLDLEVELBASE 0x400
|
||||
#define wxSTC_FOLDLEVELWHITEFLAG 0x1000
|
||||
#define wxSTC_FOLDLEVELHEADERFLAG 0x2000
|
||||
@@ -190,158 +178,6 @@
|
||||
#define wxSTC_CACHE_CARET 1
|
||||
#define wxSTC_CACHE_PAGE 2
|
||||
#define wxSTC_CACHE_DOCUMENT 3
|
||||
|
||||
// Move caret down one line.
|
||||
#define wxSTC_CMD_LINEDOWN 2300
|
||||
|
||||
// Move caret down one line extending selection to new caret position.
|
||||
#define wxSTC_CMD_LINEDOWNEXTEND 2301
|
||||
|
||||
// Move caret up one line.
|
||||
#define wxSTC_CMD_LINEUP 2302
|
||||
|
||||
// Move caret up one line extending selection to new caret position.
|
||||
#define wxSTC_CMD_LINEUPEXTEND 2303
|
||||
|
||||
// Move caret left one character.
|
||||
#define wxSTC_CMD_CHARLEFT 2304
|
||||
|
||||
// Move caret left one character extending selection to new caret position.
|
||||
#define wxSTC_CMD_CHARLEFTEXTEND 2305
|
||||
|
||||
// Move caret right one character.
|
||||
#define wxSTC_CMD_CHARRIGHT 2306
|
||||
|
||||
// Move caret right one character extending selection to new caret position.
|
||||
#define wxSTC_CMD_CHARRIGHTEXTEND 2307
|
||||
|
||||
// Move caret left one word.
|
||||
#define wxSTC_CMD_WORDLEFT 2308
|
||||
|
||||
// Move caret left one word extending selection to new caret position.
|
||||
#define wxSTC_CMD_WORDLEFTEXTEND 2309
|
||||
|
||||
// Move caret right one word.
|
||||
#define wxSTC_CMD_WORDRIGHT 2310
|
||||
|
||||
// Move caret right one word extending selection to new caret position.
|
||||
#define wxSTC_CMD_WORDRIGHTEXTEND 2311
|
||||
|
||||
// Move caret to first position on line.
|
||||
#define wxSTC_CMD_HOME 2312
|
||||
|
||||
// Move caret to first position on line extending selection to new caret position.
|
||||
#define wxSTC_CMD_HOMEEXTEND 2313
|
||||
|
||||
// Move caret to last position on line.
|
||||
#define wxSTC_CMD_LINEEND 2314
|
||||
|
||||
// Move caret to last position on line extending selection to new caret position.
|
||||
#define wxSTC_CMD_LINEENDEXTEND 2315
|
||||
|
||||
// Move caret to first position in document.
|
||||
#define wxSTC_CMD_DOCUMENTSTART 2316
|
||||
|
||||
// Move caret to first position in document extending selection to new caret position.
|
||||
#define wxSTC_CMD_DOCUMENTSTARTEXTEND 2317
|
||||
|
||||
// Move caret to last position in document.
|
||||
#define wxSTC_CMD_DOCUMENTEND 2318
|
||||
|
||||
// Move caret to last position in document extending selection to new caret position.
|
||||
#define wxSTC_CMD_DOCUMENTENDEXTEND 2319
|
||||
|
||||
// Move caret one page up.
|
||||
#define wxSTC_CMD_PAGEUP 2320
|
||||
|
||||
// Move caret one page up extending selection to new caret position.
|
||||
#define wxSTC_CMD_PAGEUPEXTEND 2321
|
||||
|
||||
// Move caret one page down.
|
||||
#define wxSTC_CMD_PAGEDOWN 2322
|
||||
|
||||
// Move caret one page down extending selection to new caret position.
|
||||
#define wxSTC_CMD_PAGEDOWNEXTEND 2323
|
||||
|
||||
// Switch from insert to overtype mode or the reverse.
|
||||
#define wxSTC_CMD_EDITTOGGLEOVERTYPE 2324
|
||||
|
||||
// Cancel any modes such as call tip or auto-completion list display.
|
||||
#define wxSTC_CMD_CANCEL 2325
|
||||
|
||||
// Delete the selection or if no selection, the character before the caret.
|
||||
#define wxSTC_CMD_DELETEBACK 2326
|
||||
|
||||
// If selection is empty or all on one line replace the selection with a tab character.
|
||||
// If more than one line selected, indent the lines.
|
||||
#define wxSTC_CMD_TAB 2327
|
||||
|
||||
// Dedent the selected lines.
|
||||
#define wxSTC_CMD_BACKTAB 2328
|
||||
|
||||
// Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
|
||||
#define wxSTC_CMD_NEWLINE 2329
|
||||
|
||||
// Insert a Form Feed character.
|
||||
#define wxSTC_CMD_FORMFEED 2330
|
||||
|
||||
// Move caret to before first visible character on line.
|
||||
// If already there move to first character on line.
|
||||
#define wxSTC_CMD_VCHOME 2331
|
||||
|
||||
// Like VCHome but extending selection to new caret position.
|
||||
#define wxSTC_CMD_VCHOMEEXTEND 2332
|
||||
|
||||
// Magnify the displayed text by increasing the sizes by 1 point.
|
||||
#define wxSTC_CMD_ZOOMIN 2333
|
||||
|
||||
// Make the displayed text smaller by decreasing the sizes by 1 point.
|
||||
#define wxSTC_CMD_ZOOMOUT 2334
|
||||
|
||||
// Delete the word to the left of the caret.
|
||||
#define wxSTC_CMD_DELWORDLEFT 2335
|
||||
|
||||
// Delete the word to the right of the caret.
|
||||
#define wxSTC_CMD_DELWORDRIGHT 2336
|
||||
|
||||
// Cut the line containing the caret.
|
||||
#define wxSTC_CMD_LINECUT 2337
|
||||
|
||||
// Delete the line containing the caret.
|
||||
#define wxSTC_CMD_LINEDELETE 2338
|
||||
|
||||
// Switch the current line with the previous.
|
||||
#define wxSTC_CMD_LINETRANSPOSE 2339
|
||||
|
||||
// Transform the selection to lower case.
|
||||
#define wxSTC_CMD_LOWERCASE 2340
|
||||
|
||||
// Transform the selection to upper case.
|
||||
#define wxSTC_CMD_UPPERCASE 2341
|
||||
|
||||
// Scroll the document down, keeping the caret visible.
|
||||
#define wxSTC_CMD_LINESCROLLDOWN 2342
|
||||
|
||||
// Scroll the document up, keeping the caret visible.
|
||||
#define wxSTC_CMD_LINESCROLLUP 2343
|
||||
|
||||
// Delete the selection or if no selection, the character before the caret.
|
||||
// Will not delete the character before at the start of a line.
|
||||
#define wxSTC_CMD_DELETEBACKNOTLINE 2344
|
||||
|
||||
// Move caret to first position on display line.
|
||||
#define wxSTC_CMD_HOMEDISPLAY 2345
|
||||
|
||||
// Move caret to first position on display line extending selection to
|
||||
// new caret position.
|
||||
#define wxSTC_CMD_HOMEDISPLAYEXTEND 2346
|
||||
|
||||
// Move caret to last position on display line.
|
||||
#define wxSTC_CMD_LINEENDDISPLAY 2347
|
||||
|
||||
// Move caret to last position on display line extending selection to new
|
||||
// caret position.
|
||||
#define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
|
||||
#define wxSTC_EDGE_NONE 0
|
||||
#define wxSTC_EDGE_LINE 1
|
||||
#define wxSTC_EDGE_BACKGROUND 2
|
||||
@@ -866,6 +702,204 @@
|
||||
#define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR 18
|
||||
#define wxSTC_SCRIPTOL_COMMENTBASIC 19
|
||||
|
||||
|
||||
//-----------------------------------------
|
||||
// Commands that can be bound to keystrokes
|
||||
|
||||
// Redoes the next action on the undo history.
|
||||
#define wxSTC_CMD_REDO 2011
|
||||
|
||||
// Select all the text in the document.
|
||||
#define wxSTC_CMD_SELECTALL 2013
|
||||
|
||||
// Undo one action in the undo history.
|
||||
#define wxSTC_CMD_UNDO 2176
|
||||
|
||||
// Cut the selection to the clipboard.
|
||||
#define wxSTC_CMD_CUT 2177
|
||||
|
||||
// Copy the selection to the clipboard.
|
||||
#define wxSTC_CMD_COPY 2178
|
||||
|
||||
// Paste the contents of the clipboard into the document replacing the selection.
|
||||
#define wxSTC_CMD_PASTE 2179
|
||||
|
||||
// Clear the selection.
|
||||
#define wxSTC_CMD_CLEAR 2180
|
||||
|
||||
// Move caret down one line.
|
||||
#define wxSTC_CMD_LINEDOWN 2300
|
||||
|
||||
// Move caret down one line extending selection to new caret position.
|
||||
#define wxSTC_CMD_LINEDOWNEXTEND 2301
|
||||
|
||||
// Move caret up one line.
|
||||
#define wxSTC_CMD_LINEUP 2302
|
||||
|
||||
// Move caret up one line extending selection to new caret position.
|
||||
#define wxSTC_CMD_LINEUPEXTEND 2303
|
||||
|
||||
// Move caret left one character.
|
||||
#define wxSTC_CMD_CHARLEFT 2304
|
||||
|
||||
// Move caret left one character extending selection to new caret position.
|
||||
#define wxSTC_CMD_CHARLEFTEXTEND 2305
|
||||
|
||||
// Move caret right one character.
|
||||
#define wxSTC_CMD_CHARRIGHT 2306
|
||||
|
||||
// Move caret right one character extending selection to new caret position.
|
||||
#define wxSTC_CMD_CHARRIGHTEXTEND 2307
|
||||
|
||||
// Move caret left one word.
|
||||
#define wxSTC_CMD_WORDLEFT 2308
|
||||
|
||||
// Move caret left one word extending selection to new caret position.
|
||||
#define wxSTC_CMD_WORDLEFTEXTEND 2309
|
||||
|
||||
// Move caret right one word.
|
||||
#define wxSTC_CMD_WORDRIGHT 2310
|
||||
|
||||
// Move caret right one word extending selection to new caret position.
|
||||
#define wxSTC_CMD_WORDRIGHTEXTEND 2311
|
||||
|
||||
// Move caret to first position on line.
|
||||
#define wxSTC_CMD_HOME 2312
|
||||
|
||||
// Move caret to first position on line extending selection to new caret position.
|
||||
#define wxSTC_CMD_HOMEEXTEND 2313
|
||||
|
||||
// Move caret to last position on line.
|
||||
#define wxSTC_CMD_LINEEND 2314
|
||||
|
||||
// Move caret to last position on line extending selection to new caret position.
|
||||
#define wxSTC_CMD_LINEENDEXTEND 2315
|
||||
|
||||
// Move caret to first position in document.
|
||||
#define wxSTC_CMD_DOCUMENTSTART 2316
|
||||
|
||||
// Move caret to first position in document extending selection to new caret position.
|
||||
#define wxSTC_CMD_DOCUMENTSTARTEXTEND 2317
|
||||
|
||||
// Move caret to last position in document.
|
||||
#define wxSTC_CMD_DOCUMENTEND 2318
|
||||
|
||||
// Move caret to last position in document extending selection to new caret position.
|
||||
#define wxSTC_CMD_DOCUMENTENDEXTEND 2319
|
||||
|
||||
// Move caret one page up.
|
||||
#define wxSTC_CMD_PAGEUP 2320
|
||||
|
||||
// Move caret one page up extending selection to new caret position.
|
||||
#define wxSTC_CMD_PAGEUPEXTEND 2321
|
||||
|
||||
// Move caret one page down.
|
||||
#define wxSTC_CMD_PAGEDOWN 2322
|
||||
|
||||
// Move caret one page down extending selection to new caret position.
|
||||
#define wxSTC_CMD_PAGEDOWNEXTEND 2323
|
||||
|
||||
// Switch from insert to overtype mode or the reverse.
|
||||
#define wxSTC_CMD_EDITTOGGLEOVERTYPE 2324
|
||||
|
||||
// Cancel any modes such as call tip or auto-completion list display.
|
||||
#define wxSTC_CMD_CANCEL 2325
|
||||
|
||||
// Delete the selection or if no selection, the character before the caret.
|
||||
#define wxSTC_CMD_DELETEBACK 2326
|
||||
|
||||
// If selection is empty or all on one line replace the selection with a tab character.
|
||||
// If more than one line selected, indent the lines.
|
||||
#define wxSTC_CMD_TAB 2327
|
||||
|
||||
// Dedent the selected lines.
|
||||
#define wxSTC_CMD_BACKTAB 2328
|
||||
|
||||
// Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
|
||||
#define wxSTC_CMD_NEWLINE 2329
|
||||
|
||||
// Insert a Form Feed character.
|
||||
#define wxSTC_CMD_FORMFEED 2330
|
||||
|
||||
// Move caret to before first visible character on line.
|
||||
// If already there move to first character on line.
|
||||
#define wxSTC_CMD_VCHOME 2331
|
||||
|
||||
// Like VCHome but extending selection to new caret position.
|
||||
#define wxSTC_CMD_VCHOMEEXTEND 2332
|
||||
|
||||
// Magnify the displayed text by increasing the sizes by 1 point.
|
||||
#define wxSTC_CMD_ZOOMIN 2333
|
||||
|
||||
// Make the displayed text smaller by decreasing the sizes by 1 point.
|
||||
#define wxSTC_CMD_ZOOMOUT 2334
|
||||
|
||||
// Delete the word to the left of the caret.
|
||||
#define wxSTC_CMD_DELWORDLEFT 2335
|
||||
|
||||
// Delete the word to the right of the caret.
|
||||
#define wxSTC_CMD_DELWORDRIGHT 2336
|
||||
|
||||
// Cut the line containing the caret.
|
||||
#define wxSTC_CMD_LINECUT 2337
|
||||
|
||||
// Delete the line containing the caret.
|
||||
#define wxSTC_CMD_LINEDELETE 2338
|
||||
|
||||
// Switch the current line with the previous.
|
||||
#define wxSTC_CMD_LINETRANSPOSE 2339
|
||||
|
||||
// Transform the selection to lower case.
|
||||
#define wxSTC_CMD_LOWERCASE 2340
|
||||
|
||||
// Transform the selection to upper case.
|
||||
#define wxSTC_CMD_UPPERCASE 2341
|
||||
|
||||
// Scroll the document down, keeping the caret visible.
|
||||
#define wxSTC_CMD_LINESCROLLDOWN 2342
|
||||
|
||||
// Scroll the document up, keeping the caret visible.
|
||||
#define wxSTC_CMD_LINESCROLLUP 2343
|
||||
|
||||
// Delete the selection or if no selection, the character before the caret.
|
||||
// Will not delete the character before at the start of a line.
|
||||
#define wxSTC_CMD_DELETEBACKNOTLINE 2344
|
||||
|
||||
// Move caret to first position on display line.
|
||||
#define wxSTC_CMD_HOMEDISPLAY 2345
|
||||
|
||||
// Move caret to first position on display line extending selection to
|
||||
// new caret position.
|
||||
#define wxSTC_CMD_HOMEDISPLAYEXTEND 2346
|
||||
|
||||
// Move caret to last position on display line.
|
||||
#define wxSTC_CMD_LINEENDDISPLAY 2347
|
||||
|
||||
// Move caret to last position on display line extending selection to new
|
||||
// caret position.
|
||||
#define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
|
||||
|
||||
// Move to the previous change in capitalisation.
|
||||
#define wxSTC_CMD_WORDPARTLEFT 2390
|
||||
|
||||
// Move to the previous change in capitalisation extending selection
|
||||
// to new caret position.
|
||||
#define wxSTC_CMD_WORDPARTLEFTEXTEND 2391
|
||||
|
||||
// Move to the change next in capitalisation.
|
||||
#define wxSTC_CMD_WORDPARTRIGHT 2392
|
||||
|
||||
// Move to the next change in capitalisation extending selection
|
||||
// to new caret position.
|
||||
#define wxSTC_CMD_WORDPARTRIGHTEXTEND 2393
|
||||
|
||||
// Delete back from the current position to the start of the line.
|
||||
#define wxSTC_CMD_DELLINELEFT 2395
|
||||
|
||||
// Delete forwards from the current position to the end of the line.
|
||||
#define wxSTC_CMD_DELLINERIGHT 2396
|
||||
|
||||
|
||||
// END of generated section
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
@@ -873,8 +907,11 @@ class ScintillaWX; // forward declare
|
||||
class WordList;
|
||||
struct SCNotification;
|
||||
|
||||
|
||||
extern const wxChar* wxSTCNameStr;
|
||||
#ifndef SWIG
|
||||
extern STCDLLEXPORT const wxChar* wxSTCNameStr;
|
||||
class STCDLLEXPORT wxStyledTextCtrl;
|
||||
class STCDLLEXPORT wxStyledTextEvent;
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
@@ -1644,14 +1681,14 @@ public:
|
||||
// Move caret to first position on display line.
|
||||
void HomeDisplay();
|
||||
|
||||
// Move caret to first position on display line extending selection to
|
||||
// Move caret to first position on display line extending selection to
|
||||
// new caret position.
|
||||
void HomeDisplayExtend();
|
||||
|
||||
// Move caret to last position on display line.
|
||||
void LineEndDisplay();
|
||||
|
||||
// Move caret to last position on display line extending selection to new
|
||||
// Move caret to last position on display line extending selection to new
|
||||
// caret position.
|
||||
void LineEndDisplayExtend();
|
||||
|
||||
@@ -1933,6 +1970,7 @@ private:
|
||||
void OnMouseMove(wxMouseEvent& evt);
|
||||
void OnMouseLeftUp(wxMouseEvent& evt);
|
||||
void OnMouseRightUp(wxMouseEvent& evt);
|
||||
void OnMouseMiddleUp(wxMouseEvent& evt);
|
||||
void OnContextMenu(wxContextMenuEvent& evt);
|
||||
void OnMouseWheel(wxMouseEvent& evt);
|
||||
void OnChar(wxKeyEvent& evt);
|
||||
@@ -1968,7 +2006,7 @@ private:
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
// SWIG can't handle "#if" type of conditionals, onlu "#ifdef"
|
||||
// SWIG can't handle "#if" type of conditionals, only "#ifdef"
|
||||
#ifdef SWIG
|
||||
#define STC_USE_DND 1
|
||||
#else
|
||||
|
@@ -46,5 +46,6 @@
|
||||
#include "wx/xrc/xh_unkwn.h"
|
||||
#include "wx/xrc/xh_gdctl.h"
|
||||
#include "wx/xrc/xh_frame.h"
|
||||
#include "wx/xrc/xh_scwin.h"
|
||||
|
||||
#endif // _WX_XMLRES_H_
|
||||
|
32
contrib/include/wx/xrc/xh_scwin.h
Normal file
32
contrib/include/wx/xrc/xh_scwin.h
Normal file
@@ -0,0 +1,32 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: xh_scwin.h
|
||||
// Purpose: XML resource handler for wxScrolledWindow
|
||||
// Author: Vaclav Slavik
|
||||
// Created: 2002/10/18
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) 2002 Vaclav Slavik
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_XH_SCWIN_H_
|
||||
#define _WX_XH_SCWIN_H_
|
||||
|
||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||
#pragma interface "xh_scwin.h"
|
||||
#endif
|
||||
|
||||
#include "wx/xrc/xmlres.h"
|
||||
#include "wx/defs.h"
|
||||
|
||||
|
||||
|
||||
class WXXMLDLLEXPORT wxScrolledWindowXmlHandler : public wxXmlResourceHandler
|
||||
{
|
||||
public:
|
||||
wxScrolledWindowXmlHandler();
|
||||
virtual wxObject *DoCreateResource();
|
||||
virtual bool CanHandle(wxXmlNode *node);
|
||||
};
|
||||
|
||||
|
||||
#endif // _WX_XH_SCWIN_H_
|
@@ -37,6 +37,9 @@ class WXDLLEXPORT wxFrame;
|
||||
class WXDLLEXPORT wxToolBar;
|
||||
|
||||
class WXXMLDLLEXPORT wxXmlResourceHandler;
|
||||
class WXXMLDLLEXPORT wxXmlSubclassFactory;
|
||||
class WXXMLDLLEXPORT wxXmlSubclassFactoriesList;
|
||||
class wxXmlResourceModule;
|
||||
|
||||
|
||||
// These macros indicate current version of XML resources (this information is
|
||||
@@ -133,6 +136,11 @@ public:
|
||||
|
||||
// Removes all handlers
|
||||
void ClearHandlers();
|
||||
|
||||
// Registers subclasses factory for use in XRC. This function is not meant
|
||||
// for public use, please see the comment above wxXmlSubclassFactory
|
||||
// definition.
|
||||
static void AddSubclassFactory(wxXmlSubclassFactory *factory);
|
||||
|
||||
// Loads menu from resource. Returns NULL on failure.
|
||||
wxMenu *LoadMenu(const wxString& name);
|
||||
@@ -216,7 +224,9 @@ public:
|
||||
static wxXmlResource *Set(wxXmlResource *res);
|
||||
|
||||
// Returns flags, which may be a bitlist of wxXRC_USE_LOCALE and wxXRC_NO_SUBCLASSING.
|
||||
int GetFlags() { return m_flags; }
|
||||
int GetFlags() const { return m_flags; }
|
||||
// Set flags after construction.
|
||||
void SetFlags(int flags) { m_flags = flags; }
|
||||
|
||||
protected:
|
||||
// Scans the resources list for unloaded files and loads them. Also reloads
|
||||
@@ -244,6 +254,9 @@ private:
|
||||
#endif
|
||||
|
||||
friend class wxXmlResourceHandler;
|
||||
friend class wxXmlResourceModule;
|
||||
|
||||
static wxXmlSubclassFactoriesList *ms_subclassFactories;
|
||||
|
||||
// singleton instance:
|
||||
static wxXmlResource *ms_instance;
|
||||
@@ -438,6 +451,20 @@ protected:
|
||||
void wxXmlInitResourceModule();
|
||||
|
||||
|
||||
// This class is used to create instances of XRC "object" nodes with "subclass"
|
||||
// property. It is _not_ supposed to be used by XRC users, you should instead
|
||||
// register your subclasses via wxWindows' RTTI mechanism. This class is useful
|
||||
// only for language bindings developer who need a way to implement subclassing
|
||||
// in wxWindows ports that don't support wxRTTI (e.g. wxPython).
|
||||
class WXXMLDLLEXPORT wxXmlSubclassFactory
|
||||
{
|
||||
public:
|
||||
// Try to create instance of given class and return it, return NULL on failure:
|
||||
virtual wxObject *Create(const wxString& className) = 0;
|
||||
virtual ~wxXmlSubclassFactory() {}
|
||||
};
|
||||
|
||||
|
||||
/* -------------------------------------------------------------------------
|
||||
Backward compatibility macros. Do *NOT* use, they may disappear in future
|
||||
versions of the XRC library!
|
||||
|
Reference in New Issue
Block a user