Fixed a notebook crash and added more tests to sample.

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

diff --git a/include/wx/control.h b/include/wx/control.h
index b424a69cdb0b298846c0dc3af676b2d35af7a45f..40bc3ab8fdf0b95c3281d44da59e08e3aabecea2 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -1,13 +1,22 @@
-#ifndef __CONTROLH_BASE__
-#define __CONTROLH_BASE__
+#ifndef _WX_CONTROL_H_BASE_
+#define _WX_CONTROL_H_BASE_
+
+// all classes derived from wxControl need the validators
+#include "wx/validate.h"

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

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

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

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

 #endif
 
 #endif
 #endif
 
 #endif

-    // __CONTROLH_BASE__
+    // _WX_CONTROL_H_BASE_