Fix for wxTextCtrl::GetSelection for singel line controls in GTK2 mode

[wxWidgets.git] / contrib / include / wx / gizmos / multicell.h

diff --git a/contrib/include/wx/gizmos/multicell.h b/contrib/include/wx/gizmos/multicell.h
index 6c279a817a278de0234ca0e98b7608d628c6d36f..f4cab3fffb821c963defe70ab3fbab19e34b9be0 100644 (file)
--- a/contrib/include/wx/gizmos/multicell.h
+++ b/contrib/include/wx/gizmos/multicell.h
@@ -4,7 +4,7 @@
 // Author:      Jonathan Bayer
 // Modified by:
 // Created:
 // Author:      Jonathan Bayer
 // Modified by:
 // Created:

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) Jonathan Bayer
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Jonathan Bayer
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -15,17 +15,11 @@
 #ifndef __WX_MULTICELL_H__
 #define __WX_MULTICELL_H__
 
 #ifndef __WX_MULTICELL_H__
 #define __WX_MULTICELL_H__
 

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

        #pragma interface "multicell.h"
 #endif
 
        #pragma interface "multicell.h"
 #endif
 

-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
+#include "wx/gizmos/gizmos.h"

 
 // ----------------------------------------------------------------------------
 // headers
 
 // ----------------------------------------------------------------------------
 // headers


@@ -40,7 +34,7 @@
 enum wxResizable
 {
        wxNOT_RESIZABLE =           0x00,
 enum wxResizable
 {
        wxNOT_RESIZABLE =           0x00,

-       wxHORIZENTAL_RESIZABLE =    0x01,
+       wxHORIZONTAL_RESIZABLE =    0x01,

        wxVERTICAL_RESIZABLE =      0x10,
        wxRESIZABLE =               0x11
 };
        wxVERTICAL_RESIZABLE =      0x10,
        wxRESIZABLE =               0x11
 };


@@ -53,7 +47,7 @@ enum wxResizable
 // wxMultiCellItemHandle
 //---------------------------------------------------------------------------
 
 // wxMultiCellItemHandle
 //---------------------------------------------------------------------------
 

-class GIZMODLLEXPORT wxMultiCellItemHandle: public wxObject
+class WXDLLIMPEXP_GIZMOS wxMultiCellItemHandle: public wxObject

 {
        DECLARE_CLASS(wxMultiCellItemHandle);
 protected:
 {
        DECLARE_CLASS(wxMultiCellItemHandle);
 protected:


@@ -89,7 +83,7 @@ private:
 // wxMultiCellSizer
 //---------------------------------------------------------------------------
 
 // wxMultiCellSizer
 //---------------------------------------------------------------------------
 

-class GIZMODLLEXPORT wxMultiCellSizer : virtual public wxSizer
+class WXDLLIMPEXP_GIZMOS wxMultiCellSizer : virtual public wxSizer

 {
        DECLARE_CLASS(wxMultiCellSizer);
 
 {
        DECLARE_CLASS(wxMultiCellSizer);
 


@@ -139,7 +133,7 @@ class wxCell;
 // wxMultiCellCanvas
 //---------------------------------------------------------------------------
 
 // wxMultiCellCanvas
 //---------------------------------------------------------------------------
 

-class GIZMODLLEXPORT wxMultiCellCanvas : public wxFlexGridSizer
+class WXDLLIMPEXP_GIZMOS wxMultiCellCanvas : public wxFlexGridSizer

 {
 public:
        wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);
 {
 public:
        wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);