[ 1494561 ] wxComboCtrl vertical size fix.

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

diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index 6c4ae240c9311d69dca9797520e4b2e3bd7e4787..f223891efa6e0e1c0b51dd2a2339d561171a5a63 100644 (file)
--- a/include/wx/generic/sashwin.h
+++ b/include/wx/generic/sashwin.h
@@ -8,16 +8,12 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SASHWIN_H_G_
 #define _WX_SASHWIN_H_G_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SASHWIN_H_G_
 #define _WX_SASHWIN_H_G_
 

-#ifdef __GNUG__
-#pragma interface "sashwin.h"
-#endif
-

 #if wxUSE_SASH
 
 #include "wx/defs.h"
 #if wxUSE_SASH
 
 #include "wx/defs.h"


@@ -40,13 +36,20 @@ enum wxSashEdgePosition {
  * wxSashEdge represents one of the four edges of a window.
  */
 
  * wxSashEdge represents one of the four edges of a window.
  */
 

-class WXDLLEXPORT wxSashEdge
+class WXDLLIMPEXP_ADV wxSashEdge

 {
 public:
 {
 public:

-    wxSashEdge() { m_show = FALSE; m_border = FALSE; m_margin = 0; }
+    wxSashEdge()
+    { m_show = false;
+#if WXWIN_COMPATIBILITY_2_6
+      m_border = false;
+#endif
+      m_margin = 0; }

 
     bool    m_show;     // Is the sash showing?
 
     bool    m_show;     // Is the sash showing?

+#if WXWIN_COMPATIBILITY_2_6

     bool    m_border;   // Do we draw a border?
     bool    m_border;   // Do we draw a border?

+#endif

     int     m_margin;   // The margin size
 };
 
     int     m_margin;   // The margin size
 };
 


@@ -67,15 +70,9 @@ public:
  * of wxSashWindow.
  */
 
  * of wxSashWindow.
  */
 

-class WXDLLEXPORT wxSashWindow: public wxWindow
+class WXDLLIMPEXP_ADV wxSashWindow: public wxWindow

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxSashWindow)
-

 public:
 public:

-
-////////////////////////////////////////////////////////////////////////////
-// Public API
-

     // Default constructor
     wxSashWindow()
     {
     // Default constructor
     wxSashWindow()
     {


@@ -83,8 +80,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,35 +89,39 @@ 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);
 
     // Get whether there's a sash in this position
 
     // Set whether there's a sash in this position
     void SetSashVisible(wxSashEdgePosition edge, bool sash);
 
     // Get whether there's a sash in this position

-    inline bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; }
+    bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; }

 
 

+#if WXWIN_COMPATIBILITY_2_6

     // Set whether there's a border in this position
     // Set whether there's a border in this position

-    inline void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
+    // This value is unused in wxSashWindow.
+    void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }

 
     // Get whether there's a border in this position
 
     // Get whether there's a border in this position

-    inline bool HasBorder(wxSashEdgePosition edge) const { return m_sashes[edge].m_border; }
+    // This value is unused in wxSashWindow.
+    bool HasBorder(wxSashEdgePosition edge) const { return m_sashes[edge].m_border; }
+#endif

 
     // Get border size
 
     // Get border size

-    inline int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; }
+    int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; }

 
     // Sets the default sash border size
 
     // Sets the default sash border size

-    inline void SetDefaultBorderSize(int width) { m_borderSize = width; }
+    void SetDefaultBorderSize(int width) { m_borderSize = width; }

 
     // Gets the default sash border size
 
     // Gets the default sash border size

-    inline int GetDefaultBorderSize() const { return m_borderSize; }
+    int GetDefaultBorderSize() const { return m_borderSize; }

 
     // Sets the addition border size between child and sash window
 
     // Sets the addition border size between child and sash window

-    inline void SetExtraBorderSize(int width) { m_extraBorderSize = width; }
+    void SetExtraBorderSize(int width) { m_extraBorderSize = width; }

 
     // Gets the addition border size between child and sash window
 
     // Gets the addition border size between child and sash window

-    inline int GetExtraBorderSize() const { return m_extraBorderSize; }
+    int GetExtraBorderSize() const { return m_extraBorderSize; }

 
     virtual void SetMinimumSizeX(int min) { m_minimumPaneSizeX = min; }
     virtual void SetMinimumSizeY(int min) { m_minimumPaneSizeY = min; }
 
     virtual void SetMinimumSizeX(int min) { m_minimumPaneSizeX = min; }
     virtual void SetMinimumSizeY(int min) { m_minimumPaneSizeY = min; }


@@ -144,6 +145,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 +195,18 @@ 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()

 
 enum wxSashDragStatus
 {
 
 enum wxSashDragStatus
 {


@@ -201,35 +214,46 @@ enum wxSashDragStatus
     wxSASH_STATUS_OUT_OF_RANGE
 };
 
     wxSASH_STATUS_OUT_OF_RANGE
 };
 

-class WXDLLEXPORT wxSashEvent: public wxCommandEvent
+class WXDLLIMPEXP_ADV wxSashEvent: public wxCommandEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxSashEvent)
-
- public:
-    inline wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) {
-     m_eventType = (wxEventType) wxEVT_SASH_DRAGGED; m_id = id; m_edge = edge; }
+public:
+    wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE)
+    {
+        m_eventType = (wxEventType) wxEVT_SASH_DRAGGED;
+        m_id = id;
+        m_edge = edge;
+    }

 
 

-    inline void SetEdge(wxSashEdgePosition edge) { m_edge = edge; }
-    inline wxSashEdgePosition GetEdge() const { return m_edge; }
+    void SetEdge(wxSashEdgePosition edge) { m_edge = edge; }
+    wxSashEdgePosition GetEdge() const { return m_edge; }

 
     //// The rectangle formed by the drag operation
 
     //// The rectangle formed by the drag operation

-    inline void SetDragRect(const wxRect& rect) { m_dragRect = rect; }
-    inline wxRect GetDragRect() const { return m_dragRect; }
+    void SetDragRect(const wxRect& rect) { m_dragRect = rect; }
+    wxRect GetDragRect() const { return m_dragRect; }

 
     //// Whether the drag caused the rectangle to be reversed (e.g.
     //// dragging the top below the bottom)
 
     //// Whether the drag caused the rectangle to be reversed (e.g.
     //// dragging the top below the bottom)

-    inline void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; }
-    inline wxSashDragStatus GetDragStatus() const { return m_dragStatus; }
- private:
+    void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; }
+    wxSashDragStatus GetDragStatus() const { return m_dragStatus; }
+
+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&);
 
 };
 
 typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);
 

-#define EVT_SASH_DRAGGED(id, fn) { wxEVT_SASH_DRAGGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
-#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) { wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
+#define wxSashEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSashEventFunction, &func)
+
+#define EVT_SASH_DRAGGED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_SASH_DRAGGED, id, wxSashEventHandler(fn))
+#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) \
+    wx__DECLARE_EVT2(wxEVT_SASH_DRAGGED, id1, id2, wxSashEventHandler(fn))

 
 #endif // wxUSE_SASH
 
 
 #endif // wxUSE_SASH