No changes, just simplify preprocessor checks in wxMSW wxTextEntry.

[wxWidgets.git] / include / wx / generic / splitter.h

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 0e7c694f7c2e805f6d1c007e52e80a9d8a02e599..cbb072eecc89bd97c04660685ca34764eb2e5c65 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/splitter.h
+// Name:        wx/generic/splitter.h

 // Purpose:     wxSplitterWindow class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxSplitterWindow class
 // Author:      Julian Smart
 // Modified by:


@@ -49,7 +49,7 @@ enum
 //    to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be
 //    standard).
 
 //    to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be
 //    standard).
 

-class WXDLLEXPORT wxSplitterWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxSplitterWindow: public wxWindow

 {
 public:
 
 {
 public:
 


@@ -91,7 +91,7 @@ public:
     void SetSplitMode(int mode)
     {
         wxASSERT_MSG( mode == wxSPLIT_VERTICAL || mode == wxSPLIT_HORIZONTAL,
     void SetSplitMode(int mode)
     {
         wxASSERT_MSG( mode == wxSPLIT_VERTICAL || mode == wxSPLIT_HORIZONTAL,

-                      _T("invalid split mode") );
+                      wxT("invalid split mode") );

 
         m_splitMode = (wxSplitMode)mode;
     }
 
         m_splitMode = (wxSplitMode)mode;
     }


@@ -119,7 +119,7 @@ public:
 
     // Removes the specified (or second) window from the view
     // Doesn't actually delete the window.
 
     // Removes the specified (or second) window from the view
     // Doesn't actually delete the window.

-    bool Unsplit(wxWindow *toRemove = (wxWindow *) NULL);
+    bool Unsplit(wxWindow *toRemove = NULL);

 
     // Replaces one of the windows with another one (neither old nor new
     // parameter should be NULL)
 
     // Replaces one of the windows with another one (neither old nor new
     // parameter should be NULL)


@@ -133,9 +133,6 @@ public:
     // Is the window split?
     bool IsSplit() const { return (m_windowTwo != NULL); }
 
     // Is the window split?
     bool IsSplit() const { return (m_windowTwo != NULL); }
 

-    // Sets the sash size
-    void SetSashSize(int width) { m_sashSize = width; }
-

     // Sets the border size
     void SetBorderSize(int WXUNUSED(width)) { }
 
     // Sets the border size
     void SetBorderSize(int WXUNUSED(width)) { }
 


@@ -193,6 +190,9 @@ public:
     // Handles mouse events
     void OnMouseEvent(wxMouseEvent& ev);
 
     // Handles mouse events
     void OnMouseEvent(wxMouseEvent& ev);
 

+    // Aborts dragging mode
+    void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
+

     // Adjusts the panes
     void OnSize(wxSizeEvent& event);
 
     // Adjusts the panes
     void OnSize(wxSizeEvent& event);
 


@@ -218,6 +218,10 @@ public:
     virtual bool MacClipGrandChildren() const { return true ; }
 #endif
 
     virtual bool MacClipGrandChildren() const { return true ; }
 #endif
 

+    // Sets the sash size: this doesn't do anything and shouldn't be used at
+    // all any more.
+    wxDEPRECATED_INLINE( void SetSashSize(int WXUNUSED(width)), return; )
+

 protected:
     // event handlers
 #if defined(__WXMSW__) || defined(__WXMAC__)
 protected:
     // event handlers
 #if defined(__WXMSW__) || defined(__WXMAC__)


@@ -275,16 +279,15 @@ protected:
     wxWindow*   m_windowOne;
     wxWindow*   m_windowTwo;
     int         m_dragMode;
     wxWindow*   m_windowOne;
     wxWindow*   m_windowTwo;
     int         m_dragMode;

-    int         m_oldX;
-    int         m_oldY;
+    int         m_oldX;         // current tracker position if not live mode
+    int         m_oldY;         // current tracker position if not live mode

     int         m_sashPosition; // Number of pixels from left or top
     double      m_sashGravity;
     int         m_sashPosition; // Number of pixels from left or top
     double      m_sashGravity;

-    int         m_sashSize;

     wxSize      m_lastSize;
     int         m_requestedSashPosition;
     int         m_sashPositionCurrent; // while dragging
     wxSize      m_lastSize;
     int         m_requestedSashPosition;
     int         m_sashPositionCurrent; // while dragging

-    int         m_firstX;
-    int         m_firstY;
+    wxPoint     m_ptStart;      // mouse position when dragging started
+    int         m_sashStart;    // sash position when dragging started

     int         m_minimumPaneSize;
     wxCursor    m_sashCursorWE;
     wxCursor    m_sashCursorNS;
     int         m_minimumPaneSize;
     wxCursor    m_sashCursorWE;
     wxCursor    m_sashCursorNS;


@@ -301,7 +304,7 @@ private:
 
     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxSplitterWindow)
+    wxDECLARE_NO_COPY_CLASS(wxSplitterWindow);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -312,16 +315,18 @@ private:
 // usual wxWin convention, but the three event types have different kind of
 // data associated with them, so the accessors can be only used if the real
 // event type matches with the one for which the accessors make sense
 // usual wxWin convention, but the three event types have different kind of
 // data associated with them, so the accessors can be only used if the real
 // event type matches with the one for which the accessors make sense

-class WXDLLEXPORT wxSplitterEvent : public wxNotifyEvent
+class WXDLLIMPEXP_CORE wxSplitterEvent : public wxNotifyEvent

 {
 public:
     wxSplitterEvent(wxEventType type = wxEVT_NULL,
 {
 public:
     wxSplitterEvent(wxEventType type = wxEVT_NULL,

-                    wxSplitterWindow *splitter = (wxSplitterWindow *)NULL)
+                    wxSplitterWindow *splitter = NULL)

         : wxNotifyEvent(type)
     {
         SetEventObject(splitter);
         if (splitter) m_id = splitter->GetId();
     }
         : wxNotifyEvent(type)
     {
         SetEventObject(splitter);
         if (splitter) m_id = splitter->GetId();
     }

+    wxSplitterEvent(const wxSplitterEvent& event)
+        : wxNotifyEvent(event), m_data(event.m_data) { }

 
     // SASH_POS_CHANGED methods
 
 
     // SASH_POS_CHANGED methods
 


@@ -366,6 +371,8 @@ public:
         return m_data.pt.y;
     }
 
         return m_data.pt.y;
     }
 

+    virtual wxEvent *Clone() const { return new wxSplitterEvent(*this); }
+

 private:
     friend class WXDLLIMPEXP_FWD_CORE wxSplitterWindow;
 
 private:
     friend class WXDLLIMPEXP_FWD_CORE wxSplitterWindow;
 


@@ -380,13 +387,13 @@ private:
         } pt;               // position of double click for DCLICK event
     } m_data;
 
         } pt;               // position of double click for DCLICK event
     } m_data;
 

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSplitterEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSplitterEvent)

 };
 
 typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 
 #define wxSplitterEventHandler(func) \
 };
 
 typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 
 #define wxSplitterEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSplitterEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxSplitterEventFunction, func)

 
 #define wx__DECLARE_SPLITTEREVT(evt, id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn))
 
 #define wx__DECLARE_SPLITTEREVT(evt, id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn))