Platform define for wxWinCE

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index cf9dd6d06468abbf49602f7d5eefbc53e45a2074..5482b488488ef237c338d436ac430631e8284857 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -231,11 +231,14 @@ typedef int wxWindowID;
 
 // check for explicit keyword support
 #ifndef HAVE_EXPLICIT
 
 // check for explicit keyword support
 #ifndef HAVE_EXPLICIT

-    // VC++ 6.0 has explicit (what about the earlier versions?)

     #if defined(__VISUALC__) && (__VISUALC__ > 1200)
     #if defined(__VISUALC__) && (__VISUALC__ > 1200)

+        // VC++ 6.0 has explicit (what about the earlier versions?)
+        #define HAVE_EXPLICIT
+    #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520)
+        // BC++ 4.52 doesn't support explicit, CBuilder 1 does

         #define HAVE_EXPLICIT
         #define HAVE_EXPLICIT

-    // Metrowerks CW6 or higher has explicit

     #elif defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
     #elif defined(__MWERKS__) && (__MWERKS__ >= 0x2400)

+        // Metrowerks CW6 or higher has explicit

         #define HAVE_EXPLICIT
     #endif
 #endif // !HAVE_EXPLICIT
         #define HAVE_EXPLICIT
     #endif
 #endif // !HAVE_EXPLICIT


@@ -1096,6 +1099,7 @@ enum wxBorder
  * wxRadioButton style flag
  */
 #define wxRB_GROUP          0x0004
  * wxRadioButton style flag
  */
 #define wxRB_GROUP          0x0004

+#define wxRB_SINGLE         0x0008

 
 /*
  * wxGauge flags
 
 /*
  * wxGauge flags


@@ -1169,8 +1173,12 @@ enum wxBorder
  */
 #define wxTC_RIGHTJUSTIFY     0x0010
 #define wxTC_FIXEDWIDTH       0x0020
  */
 #define wxTC_RIGHTJUSTIFY     0x0010
 #define wxTC_FIXEDWIDTH       0x0020

-#define wxTC_OWNERDRAW        0x0040
+#define wxTC_TOP              0x0000    // default
+#define wxTC_LEFT             0x0020
+#define wxTC_RIGHT            0x0040
+#define wxTC_BOTTOM           0x0080

 #define wxTC_MULTILINE        wxNB_MULTILINE
 #define wxTC_MULTILINE        wxNB_MULTILINE

+#define wxTC_OWNERDRAW        0x0200

 
 // wxToolBar style flags
 #define wxTB_HORIZONTAL     wxHORIZONTAL    // == 0x0004
 
 // wxToolBar style flags
 #define wxTB_HORIZONTAL     wxHORIZONTAL    // == 0x0004


@@ -1791,11 +1799,11 @@ enum wxPrintMode
 
 // macro to specify "All Files" on different platforms
 #if defined(__WXMSW__) || defined(__WXPM__)
 
 // macro to specify "All Files" on different platforms
 #if defined(__WXMSW__) || defined(__WXPM__)

-#   define wxALL_FILES_PATTERN   "*.*"
-#   define wxALL_FILES           gettext_noop("All files (*.*)|*.*")
+#   define wxALL_FILES_PATTERN   wxT("*.*")
+#   define wxALL_FILES           gettext_noop(wxT("All files (*.*)|*.*"))

 #else
 #else

-#   define wxALL_FILES_PATTERN   "*"
-#   define wxALL_FILES           gettext_noop("All files (*)|*")
+#   define wxALL_FILES_PATTERN   wxT("*")
+#   define wxALL_FILES           gettext_noop(wxT("All files (*)|*"))

 #endif
 
 // ---------------------------------------------------------------------------
 #endif
 
 // ---------------------------------------------------------------------------


@@ -2080,13 +2088,24 @@ typedef GtkWidget *WXWidget;
 #endif
 
 #ifdef __WXGTK20__
 #endif
 
 #ifdef __WXGTK20__

+/* Input method thing */
+typedef struct _GtkIMMulticontext    GtkIMMulticontext;
+#endif // __WXGTK20__
+
+#endif // __WXGTK__
+
+#if defined(__WXGTK20__) || (defined(__WXX11__) && wxUSE_UNICODE)
+#define wxUSE_PANGO 1
+#else
+#define wxUSE_PANGO 0
+#endif
+
+#if wxUSE_PANGO

 /* Stand-ins for Pango types */
 typedef struct _PangoContext         PangoContext;
 typedef struct _PangoLayout          PangoLayout;
 typedef struct _PangoFontDescription PangoFontDescription;
 /* Stand-ins for Pango types */
 typedef struct _PangoContext         PangoContext;
 typedef struct _PangoLayout          PangoLayout;
 typedef struct _PangoFontDescription PangoFontDescription;

-#endif // GTK+ 2.0
-
-#endif // GTK
+#endif

 
 #ifdef __WXMGL__
 typedef struct window_t *WXWidget;
 
 #ifdef __WXMGL__
 typedef struct window_t *WXWidget;