GetNumberOfLines on GTK doesn't count wrapped lines again...

[wxWidgets.git] / src / gtk1 / data.cpp

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index f0626d144808f4ca98f26cd5e665c2279ec9bce0..f1f49656b80444dfe24b1edf0c559ecbc8be271c 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/data.cpp
+// Name:        src/gtk1/data.cpp

 // Purpose:     Various global GTK-specific data
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     Various global GTK-specific data
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,26 +10,26 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/window.h"
-#include "wx/dc.h"
-#include "wx/cursor.h"
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/window.h"
+    #include "wx/dc.h"
+    #include "wx/cursor.h"
+#endif

 
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 wxCursor g_globalCursor;
 
 /* Don't allow event propagation during drag */
 
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 wxCursor g_globalCursor;
 
 /* Don't allow event propagation during drag */

-bool g_blockEventsOnDrag = FALSE;
+bool g_blockEventsOnDrag = false;

 
 /* Don't allow mouse event propagation during scroll */
 
 /* Don't allow mouse event propagation during scroll */

-bool g_blockEventsOnScroll = FALSE;
+bool g_blockEventsOnScroll = false;

 
 /* Don't allow window closing if there are open dialogs */
 int g_openDialogs = 0;
 
 
 /* Don't allow window closing if there are open dialogs */
 int g_openDialogs = 0;
 

-/* TRUE when the message queue is empty. this gets set to
-   FALSE by all event callbacks before anything else is done */
-bool g_isIdle = FALSE;
-
+/* true when the message queue is empty. this gets set to
+   false by all event callbacks before anything else is done */
+bool g_isIdle = false;