removed __throws_bad_alloc import, this apparently breaks CW8.3 compilation and...

[wxWidgets.git] / include / wx / accel.h

diff --git a/include/wx/accel.h b/include/wx/accel.h
index 262595461ff6f8b65cade3f80bfedebd32b9ff5f..5e22e956231df62ba65d13cd98f20d122c36357d 100644 (file)
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -118,8 +118,10 @@ private:
     #include "wx/msw/accel.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/accel.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/accel.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/accel.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"
 #elif defined(__WXCOCOA__)
@@ -128,7 +130,7 @@ private:
     #include "wx/os2/accel.h"
 #endif
 
-WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif // wxUSE_ACCEL