Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 82cf407fe67393a67d393053db5b953a64f0520b..89171ced45f6d03d8f714823ee5e88ebb55cb332 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -1,13 +1,21 @@
-#ifndef __FRAMEH_BASE__
-#define __FRAMEH_BASE__
+#ifndef _WX_FRAME_H_BASE_
+#define _WX_FRAME_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/frame.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/frame.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/frame.h"
+#include "wx/motif/frame.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/frame.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/frame.h"

+#elif defined(__WXQT__)
+#include "wx/qt/frame.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/frame.h"
+#elif defined(__WXPM__)
+#include "wx/os2/frame.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/frame.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __FRAMEH_BASE__
+    // _WX_FRAME_H_BASE_