changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 92e99ec7e8d9d7042be51559f61749675c2515ce..9d254fd7547a1ad5cb3253cec2864beb00b473c7 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -1,13 +1,23 @@
-#ifndef __NOTEBOOKH_BASE__
-#define __NOTEBOOKH_BASE__
+#ifndef _WX_NOTEBOOK_H_BASE_
+#define _WX_NOTEBOOK_H_BASE_

 
 #if defined(__WXMSW__)
 
 #if defined(__WXMSW__)

+#ifdef __WIN16__
+  #include  "wx/generic/notebook.h"
+#else

   #include  "wx/msw/notebook.h"
   #include  "wx/msw/notebook.h"

+#endif

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-  #error "wxNotebook not implemented under Motif"
+  #include  "wx/generic/notebook.h"

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

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

 #endif
 
 #endif
 #endif
 
 #endif

-    // __NOTEBOOKH_BASE__
+    // _WX_NOTEBOOK_H_BASE_