#ifndef __SPLITTERH_G__
#define __SPLITTERH_G__
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "splitter.h"
#endif
// Associates the given window with window 2, drawing the appropriate sash
// and changing the split mode.
- // Does nothing and returns FALSE if the window is already split.
+ // Does nothing and returns false if the window is already split.
// A sashPosition of 0 means choose a default sash position,
// negative sashPosition specifies the size of right/lower pane as it's
// absolute value rather than the size of left/upper pane.
bool IsSplit() const { return (m_windowTwo != NULL); }
// Sets the sash size
- void SetSashSize(int width) { m_sashSize = width; }
+ void SetSashSize(int WXUNUSED(width)) { }
// Sets the border size
- void SetBorderSize(int width) { m_borderSize = width; }
+ void SetBorderSize(int WXUNUSED(width)) { }
// Gets the sash size
- int GetSashSize() const { return m_sashSize; }
+ int GetSashSize() const;
// Gets the border size
- int GetBorderSize() const { return m_borderSize; }
+ int GetBorderSize() const;
// Set the sash position
- void SetSashPosition(int position, bool redraw = TRUE);
+ void SetSashPosition(int position, bool redraw = true);
// Gets the sash position
int GetSashPosition() const { return m_sashPosition; }
virtual int OnSashPositionChanging(int newSashPosition);
// Called when the sash position is about to be changed, return
- // FALSE from here to prevent the change from taking place.
+ // false from here to prevent the change from taking place.
// Repositions sash to minimum position if pane would be too small.
// newSashPosition here is always positive or zero.
virtual bool OnSashPositionChange(int newSashPosition);
void OnSize(wxSizeEvent& event);
// In live mode, resize child windows in idle time
- void OnIdle(wxIdleEvent& event);
-
- // Draws borders
- virtual void DrawBorders(wxDC& dc);
+ void OnInternalIdle();
// Draws the sash
virtual void DrawSash(wxDC& dc);
virtual void DrawSashTracker(int x, int y);
// Tests for x, y over sash
- virtual bool SashHitTest(int x, int y, int tolerance = 2);
+ virtual bool SashHitTest(int x, int y, int tolerance = 5);
// Resizes subwindows
virtual void SizeWindows();
- // Initialize colours
- void InitColours();
-
void SetNeedUpdating(bool needUpdating) { m_needUpdating = needUpdating; }
bool GetNeedUpdating() const { return m_needUpdating ; }
void OnSetCursor(wxSetCursorEvent& event);
#endif // wxMSW
- // send the given event, return FALSE if the event was processed and vetoed
+ // send the given event, return false if the event was processed and vetoed
// by the user code
inline bool DoSendEvent(wxSplitterEvent& event);
// set the real sash position, sashPos here must be positive
//
- // returns TRUE if the sash position has been changed, FALSE otherwise
+ // returns true if the sash position has been changed, false otherwise
bool DoSetSashPosition(int sashPos);
// set the sash position and send an event about it having been changed
void SetSashPositionAndNotify(int sashPos);
+ // callbacks executed when we detect that the mouse has entered or left
+ // the sash
+ virtual void OnEnterSash();
+ virtual void OnLeaveSash();
+
// set the cursor appropriate for the current split mode
void SetResizeCursor();
+ // redraw the splitter if its "hotness" changed if necessary
+ void RedrawIfHotSensitive(bool isHot);
+
wxSplitMode m_splitMode;
- bool m_permitUnsplitAlways;
- bool m_needUpdating; // when in live mode, set this to TRUE to resize children in idle
wxWindow* m_windowOne;
wxWindow* m_windowTwo;
int m_dragMode;
int m_oldX;
int m_oldY;
- int m_borderSize;
- int m_sashSize; // Sash width or height
int m_sashPosition; // Number of pixels from left or top
int m_requestedSashPosition;
int m_sashPositionCurrent; // while dragging
int m_minimumPaneSize;
wxCursor m_sashCursorWE;
wxCursor m_sashCursorNS;
- wxPen* m_sashTrackerPen;
- wxPen* m_lightShadowPen;
- wxPen* m_mediumShadowPen;
- wxPen* m_darkShadowPen;
- wxPen* m_hilightPen;
- wxBrush* m_faceBrush;
- wxPen* m_facePen;
+ wxPen *m_sashTrackerPen;
+
+ // when in live mode, set this to true to resize children in idle
+ bool m_needUpdating:1;
+ bool m_permitUnsplitAlways:1;
+ bool m_isHot:1;
+ bool m_checkRequestedSashPosition:1;
private:
WX_DECLARE_CONTROL_CONTAINER();
} pt; // position of double click for DCLICK event
} m_data;
- DECLARE_DYNAMIC_CLASS(wxSplitterEvent)
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxSplitterEvent)
};
typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, \
id, \
-1, \
- (wxObjectEventFunction)(wxEventFunction)(wxSplitterEventFunction) &fn, \
+ (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxSplitterEventFunction, &fn ), \
NULL \
),
wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, \
id, \
-1, \
- (wxObjectEventFunction)(wxEventFunction)(wxSplitterEventFunction) &fn, \
+ (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxSplitterEventFunction, &fn ), \
NULL \
),
wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, \
id, \
-1, \
- (wxObjectEventFunction)(wxEventFunction)(wxSplitterEventFunction) &fn, \
+ (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxSplitterEventFunction, &fn ), \
NULL \
),
wxEVT_COMMAND_SPLITTER_UNSPLIT, \
id, \
-1, \
- (wxObjectEventFunction)(wxEventFunction)(wxSplitterEventFunction) &fn, \
+ (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxSplitterEventFunction, &fn ), \
NULL \
),
projects / wxWidgets.git / blobdiff