merged MapBitmap() from 2.2 branch

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

diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp
index df4a1638a4f12fa438c24c0711230e136f23f033..dc6b6523a8562816e30755763106bcb225ee4fc2 100644 (file)
--- a/src/gtk1/data.cpp
+++ b/src/gtk1/data.cpp
@@ -7,7 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifdef __GNUG__
 // #pragma implementation
 #endif
 #ifdef __GNUG__
 // #pragma implementation
 #endif


@@ -16,20 +15,16 @@
 #include "wx/object.h"
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/object.h"
 #include "wx/window.h"
 #include "wx/dc.h"

+
+#if wxUSE_ACCEL

 #include "wx/accel.h"
 #include "wx/accel.h"

+#endif
+

 #include "wx/dcps.h"
 #include "wx/icon.h"
 
 #define _MAXPATHLEN 500
 
 #include "wx/dcps.h"
 #include "wx/icon.h"
 
 #define _MAXPATHLEN 500
 

-/* Used for X resources */
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xresource.h>
-
-wxResourceCache *wxTheResourceCache = (wxResourceCache *) NULL;
-XrmDatabase wxResourceDatabase;
-

 /* Useful buffer, initialized in wxCommonInit */
 wxChar *wxBuffer = (wxChar *) NULL;
 
 /* Useful buffer, initialized in wxCommonInit */
 wxChar *wxBuffer = (wxChar *) NULL;
 


@@ -59,12 +54,6 @@ bool g_isIdle = FALSE;
 /* Message Strings for Internationalization */
 char **wx_msg_str = (char**)NULL;
 
 /* Message Strings for Internationalization */
 char **wx_msg_str = (char**)NULL;
 

-/* Custom OS version, as optionally placed in wx.ini/.wxrc
- * Currently this can be Win95, Windows, Win32s, WinNT.
- * For some systems, you can't tell until run-time what services you
- * have. See wxGetOsVersion, which uses this string if present. */
-char *wxOsVersion = (char *) NULL;
-

 /* For printing several pages */
 int wxPageNumber;
 
 /* For printing several pages */
 int wxPageNumber;
 


@@ -139,6 +128,7 @@ wxColour   wxNullColour;
 wxPalette  wxNullPalette;
 
 /* Default window names */
 wxPalette  wxNullPalette;
 
 /* Default window names */

+const wxChar *wxControlNameStr = wxT("control");

 const wxChar *wxButtonNameStr = wxT("button");
 const wxChar *wxCanvasNameStr = wxT("canvas");
 const wxChar *wxCheckBoxNameStr = wxT("check");
 const wxChar *wxButtonNameStr = wxT("button");
 const wxChar *wxCanvasNameStr = wxT("canvas");
 const wxChar *wxCheckBoxNameStr = wxT("check");


@@ -174,6 +164,7 @@ const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error");
 const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error");
 const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
 const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error");
 const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
 const wxChar *wxDirDialogDefaultFolderStr = wxT("/");

+const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");

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