Made CCS_VERT definition more general

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

diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h
index dcd39f47f5feb5b265118ba6f41965171e363232..f5c9a9a5752200a71fb49295065c4011a6ffd86d 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 license
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "sashwin.h"
 #endif
 
 #pragma interface "sashwin.h"
 #endif
 


@@ -40,7 +40,7 @@ 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:
     wxSashEdge() { m_show = FALSE; m_border = FALSE; m_margin = 0; }
 {
 public:
     wxSashEdge() { m_show = FALSE; m_border = FALSE; m_margin = 0; }


@@ -67,7 +67,7 @@ public:
  * of wxSashWindow.
  */
 
  * of wxSashWindow.
  */
 

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

 {
 public:
     // Default constructor
 {
 public:
     // Default constructor


@@ -138,7 +138,7 @@ public:
     // Adjusts the panes
     void OnSize(wxSizeEvent& event);
 
     // Adjusts the panes
     void OnSize(wxSizeEvent& event);
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)

     // Handle cursor correctly
     void OnSetCursor(wxSetCursorEvent& event);
 #endif // wxMSW
     // Handle cursor correctly
     void OnSetCursor(wxSetCursorEvent& event);
 #endif // wxMSW


@@ -193,10 +193,12 @@ private:
 private:
     DECLARE_DYNAMIC_CLASS(wxSashWindow)
     DECLARE_EVENT_TABLE()
 private:
     DECLARE_DYNAMIC_CLASS(wxSashWindow)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxSashWindow)

 };
 
 BEGIN_DECLARE_EVENT_TYPES()
 };
 
 BEGIN_DECLARE_EVENT_TYPES()

-    DECLARE_EVENT_TYPE(wxEVT_SASH_DRAGGED, wxEVT_FIRST + 1200)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,
+                                wxEVT_SASH_DRAGGED, wxEVT_FIRST + 1200)

 END_DECLARE_EVENT_TYPES()
 
 // #define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200)
 END_DECLARE_EVENT_TYPES()
 
 // #define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200)


@@ -207,7 +209,7 @@ enum wxSashDragStatus
     wxSASH_STATUS_OUT_OF_RANGE
 };
 
     wxSASH_STATUS_OUT_OF_RANGE
 };
 

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

 {
 public:
     inline wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) {
 {
 public:
     inline wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) {


@@ -231,7 +233,7 @@ private:
     wxSashDragStatus    m_dragStatus;
 
 private:
     wxSashDragStatus    m_dragStatus;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxSashEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSashEvent)

 };
 
 typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);
 };
 
 typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);