Fixed context menu in wxRichTextCtrl

[wxWidgets.git] / include / wx / statline.h

diff --git a/include/wx/statline.h b/include/wx/statline.h
index d3757e45cf99ea36df024dccc7113bf05d7ec40e..6b43415c84115c71b4bc7578f5d9b1d643d12659 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine

-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog
 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog


@@ -47,7 +47,7 @@ public:
     static int GetDefaultSize() { return 2; }
 
     // overriden base class virtuals
     static int GetDefaultSize() { return 2; }
 
     // overriden base class virtuals

-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }

 
 protected:
     // set the right size for the right dimension
 
 protected:
     // set the right size for the right dimension


@@ -56,12 +56,12 @@ protected:
         wxSize sizeReal(size);
         if ( IsVertical() )
         {
         wxSize sizeReal(size);
         if ( IsVertical() )
         {

-            if ( size.x == -1 )
+            if ( size.x == wxDefaultCoord )

                 sizeReal.x = GetDefaultSize();
         }
         else
         {
                 sizeReal.x = GetDefaultSize();
         }
         else
         {

-            if ( size.y == -1 )
+            if ( size.y == wxDefaultCoord )

                 sizeReal.y = GetDefaultSize();
         }
 
                 sizeReal.y = GetDefaultSize();
         }
 


@@ -72,6 +72,8 @@ protected:
     {
         return AdjustSize(wxDefaultSize);
     }
     {
         return AdjustSize(wxDefaultSize);
     }

+
+    DECLARE_NO_COPY_CLASS(wxStaticLineBase)

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


@@ -82,8 +84,10 @@ protected:
     #include "wx/univ/statline.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/statline.h"
     #include "wx/univ/statline.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/statline.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/statline.h"
     #include "wx/gtk/statline.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statline.h"

 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)


@@ -96,5 +100,4 @@ protected:
 
 #endif // wxUSE_STATLINE
 
 
 #endif // wxUSE_STATLINE
 

-#endif
-    // _WX_STATLINE_H_BASE_
+#endif // _WX_STATLINE_H_BASE_