extra consts removed here and there

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

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index ff11a0b0d601adcdc20d582e7f6c06f796e55108..2c366d7d290188a78dbc922e8ee162383afbe5f4 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
 


@@ -127,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;


@@ -169,9 +173,11 @@ const wxChar *wxEmptyString = _T("");
 const wxChar *wxGetTextFromUserPromptStr = _T("Input Text");
 const wxChar *wxMessageBoxCaptionStr = _T("Message");
 const wxChar *wxFileSelectorPromptStr = _T("Select a file");
 const wxChar *wxGetTextFromUserPromptStr = _T("Input Text");
 const wxChar *wxMessageBoxCaptionStr = _T("Message");
 const wxChar *wxFileSelectorPromptStr = _T("Select a file");

-const wxChar *wxFileSelectorDefaultWildcardStr = _T("*.*");
+const wxChar *wxFileSelectorDefaultWildcardStr = _T("*");

 const wxChar *wxInternalErrorStr = _T("wxWindows Internal Error");
 const wxChar *wxFatalErrorStr = _T("wxWindows Fatal Error");
 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");