Added wxFontEnumerator class for wxMSW, and fixed text validator for French

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

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index 37f4f0006c9fcffafb2ef0ad9f290fa0f548b489..95bfdda032db62a1d185664e0065e3dc901e2cb1 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -18,6 +18,7 @@
 #include "wx/dc.h"
 #include "wx/accel.h"
 #include "wx/dcps.h"
 #include "wx/dc.h"
 #include "wx/accel.h"
 #include "wx/dcps.h"

+#include "wx/icon.h"

 
 #define _MAXPATHLEN 500
 
 
 #define _MAXPATHLEN 500
 


@@ -46,7 +47,7 @@ wxCriticalSection *wxPendingEventsLocker = NULL;
 
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */
 
 /* Current cursor, in order to hang on to
  * cursor handle when setting the cursor globally */

-wxCursor *g_globalCursor = (wxCursor *) NULL;
+wxCursor g_globalCursor;

 
 /* Don't allow event propagation during drag */
 bool g_blockEventsOnDrag = FALSE;
 
 /* Don't allow event propagation during drag */
 bool g_blockEventsOnDrag = FALSE;


@@ -54,6 +55,10 @@ bool g_blockEventsOnDrag = FALSE;
 /* Don't allow mouse event propagation during scroll */
 bool g_blockEventsOnScroll = FALSE;
 
 /* Don't allow mouse event propagation during scroll */
 bool g_blockEventsOnScroll = 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;
+

 /* Message Strings for Internationalization */
 char **wx_msg_str = (char**)NULL;
 
 /* Message Strings for Internationalization */
 char **wx_msg_str = (char**)NULL;
 


@@ -123,7 +128,10 @@ wxCursor *wxHOURGLASS_CURSOR = (wxCursor *) NULL;
 wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL;
 
 /* 'Null' objects */
 wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL;
 
 /* 'Null' objects */

-wxAcceleratorTable   wxNullAcceleratorTable;
+#if wxUSE_ACCEL
+    wxAcceleratorTable   wxNullAcceleratorTable;
+#endif // wxUSE_ACCEL
+

 wxBitmap   wxNullBitmap;
 wxIcon     wxNullIcon;
 wxCursor   wxNullCursor;
 wxBitmap   wxNullBitmap;
 wxIcon     wxNullIcon;
 wxCursor   wxNullCursor;


@@ -168,6 +176,8 @@ const wxChar *wxFileSelectorPromptStr = _T("Select a file");
 const wxChar *wxFileSelectorDefaultWildcardStr = _T("*.*");
 const wxChar *wxInternalErrorStr = _T("wxWindows Internal Error");
 const wxChar *wxFatalErrorStr = _T("wxWindows Fatal Error");
 const wxChar *wxFileSelectorDefaultWildcardStr = _T("*.*");
 const wxChar *wxInternalErrorStr = _T("wxWindows Internal Error");
 const wxChar *wxFatalErrorStr = _T("wxWindows Fatal Error");

+const wxChar *wxDirDialogNameStr = _T("wxDirCtrl");
+const wxChar *wxDirDialogDefaultFolderStr = _T("/");

 
 /* See wx/utils.h */
 const wxChar *wxFloatToStringStr = _T("%.2f");
 
 /* See wx/utils.h */
 const wxChar *wxFloatToStringStr = _T("%.2f");