added wxTimerEvent::GetTimer()

[wxWidgets.git] / src / os2 / app.cpp

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 050117d47f74a6f4be427a8bd6b71075be603736..65b080d5e955ec2d949e4b14c294dbe4b991d445 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -12,10 +12,11 @@
 // 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/app.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/frame.h"

-    #include "wx/app.h"

     #include "wx/utils.h"
     #include "wx/gdicmn.h"
     #include "wx/pen.h"
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
     #include "wx/pen.h"


@@ -28,13 +29,12 @@
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/wxchar.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/wxchar.h"

-    #include "wx/icon.h"
-    #include "wx/stdpaths.h"
-    #include "wx/filename.h"
+    #include "wx/log.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
-#include "wx/module.h"
+#include "wx/stdpaths.h"
+#include "wx/filename.h"

 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 


@@ -81,8 +81,7 @@ extern "C" int _System bsdselect(int,
 // global variables
 // ---------------------------------------------------------------------------
 
 // global variables
 // ---------------------------------------------------------------------------
 

-extern wxChar*                      wxBuffer;
-extern wxList WXDLLEXPORT           wxPendingDelete;
+WXDLLEXPORT_DATA(wxChar*) wxBuffer;

 extern wxCursor*                    g_globalCursor;
 
 HAB                                 vHabmain = NULLHANDLE;
 extern wxCursor*                    g_globalCursor;
 
 HAB                                 vHabmain = NULLHANDLE;