projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more fixes to dllexport/import stuff for operator<<()s (still bug 1104372)
[wxWidgets.git]
/
include
/
wx
/
generic
/
sashwin.h
diff --git
a/include/wx/generic/sashwin.h
b/include/wx/generic/sashwin.h
index 81fcdf1b88798092144f5d61fe0fe24aacdae7f4..0a89213437245f2eb6d4b886c2f8cc9fdfff5985 100644
(file)
--- a/
include/wx/generic/sashwin.h
+++ b/
include/wx/generic/sashwin.h
@@
-8,13
+8,13
@@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_SASHWIN_H_G_
#define _WX_SASHWIN_H_G_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_SASHWIN_H_G_
#define _WX_SASHWIN_H_G_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "sashwin.h"
#endif
#pragma interface "sashwin.h"
#endif
@@
-40,10
+40,10
@@
enum wxSashEdgePosition {
* wxSashEdge represents one of the four edges of a window.
*/
* wxSashEdge represents one of the four edges of a window.
*/
-class WXDLL
EXPORT
wxSashEdge
+class WXDLL
IMPEXP_ADV
wxSashEdge
{
public:
{
public:
- wxSashEdge() { m_show =
FALSE; m_border = FALSE
; m_margin = 0; }
+ wxSashEdge() { m_show =
false; m_border = false
; m_margin = 0; }
bool m_show; // Is the sash showing?
bool m_border; // Do we draw a border?
bool m_show; // Is the sash showing?
bool m_border; // Do we draw a border?
@@
-67,15
+67,9
@@
public:
* of wxSashWindow.
*/
* of wxSashWindow.
*/
-class WXDLL
EXPORT
wxSashWindow: public wxWindow
+class WXDLL
IMPEXP_ADV
wxSashWindow: public wxWindow
{
{
- DECLARE_DYNAMIC_CLASS(wxSashWindow)
-
public:
public:
-
-////////////////////////////////////////////////////////////////////////////
-// Public API
-
// Default constructor
wxSashWindow()
{
// Default constructor
wxSashWindow()
{
@@
-83,8
+77,8
@@
public:
}
// Normal constructor
}
// Normal constructor
- wxSashWindow(wxWindow *parent, wxWindowID id =
-1
, const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name =
"sashWindow"
)
+ wxSashWindow(wxWindow *parent, wxWindowID id =
wxID_ANY
, const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name =
wxT("sashWindow")
)
{
Init();
Create(parent, id, pos, size, style, name);
{
Init();
Create(parent, id, pos, size, style, name);
@@
-92,8
+86,8
@@
public:
~wxSashWindow();
~wxSashWindow();
- bool Create(wxWindow *parent, wxWindowID id =
-1
, const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name =
"sashWindow"
);
+ bool Create(wxWindow *parent, wxWindowID id =
wxID_ANY
, const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name =
wxT("sashWindow")
);
// Set whether there's a sash in this position
void SetSashVisible(wxSashEdgePosition edge, bool sash);
// Set whether there's a sash in this position
void SetSashVisible(wxSashEdgePosition edge, bool sash);
@@
-144,6
+138,11
@@
public:
// Adjusts the panes
void OnSize(wxSizeEvent& event);
// Adjusts the panes
void OnSize(wxSizeEvent& event);
+#if defined(__WXMSW__) || defined(__WXMAC__)
+ // Handle cursor correctly
+ void OnSetCursor(wxSetCursorEvent& event);
+#endif // wxMSW
+
// Draws borders
void DrawBorders(wxDC& dc);
// Draws borders
void DrawBorders(wxDC& dc);
@@
-189,11
+188,20
@@
private:
wxColour m_hilightColour;
wxColour m_faceColour;
bool m_mouseCaptured;
wxColour m_hilightColour;
wxColour m_faceColour;
bool m_mouseCaptured;
+ wxCursor* m_currentCursor;
-DECLARE_EVENT_TABLE()
+private:
+ DECLARE_DYNAMIC_CLASS(wxSashWindow)
+ DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxSashWindow)
};
};
-#define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200)
+BEGIN_DECLARE_EVENT_TYPES()
+ DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,
+ wxEVT_SASH_DRAGGED, wxEVT_FIRST + 1200)
+END_DECLARE_EVENT_TYPES()
+
+// #define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200)
enum wxSashDragStatus
{
enum wxSashDragStatus
{
@@
-201,11
+209,9
@@
enum wxSashDragStatus
wxSASH_STATUS_OUT_OF_RANGE
};
wxSASH_STATUS_OUT_OF_RANGE
};
-class WXDLL
EXPORT
wxSashEvent: public wxCommandEvent
+class WXDLL
IMPEXP_ADV
wxSashEvent: public wxCommandEvent
{
{
- DECLARE_DYNAMIC_CLASS(wxSashEvent)
-
- public:
+public:
inline wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) {
m_eventType = (wxEventType) wxEVT_SASH_DRAGGED; m_id = id; m_edge = edge; }
inline wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) {
m_eventType = (wxEventType) wxEVT_SASH_DRAGGED; m_id = id; m_edge = edge; }
@@
-220,18
+226,22
@@
class WXDLLEXPORT wxSashEvent: public wxCommandEvent
//// dragging the top below the bottom)
inline void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; }
inline wxSashDragStatus GetDragStatus() const { return m_dragStatus; }
//// dragging the top below the bottom)
inline void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; }
inline wxSashDragStatus GetDragStatus() const { return m_dragStatus; }
- private:
+
+private:
wxSashEdgePosition m_edge;
wxRect m_dragRect;
wxSashDragStatus m_dragStatus;
wxSashEdgePosition m_edge;
wxRect m_dragRect;
wxSashDragStatus m_dragStatus;
+
+private:
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxSashEvent)
};
typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);
#define EVT_SASH_DRAGGED(id, fn) \
};
typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);
#define EVT_SASH_DRAGGED(id, fn) \
- DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id,
-1, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn
, NULL ),
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id,
wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSashEventFunction, & fn )
, NULL ),
#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) \
#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) \
- DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction)
(wxSashEventFunction) & fn
, NULL ),
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction)
wxStaticCastEvent( wxSashEventFunction, & fn )
, NULL ),
#endif // wxUSE_SASH
#endif // wxUSE_SASH