added align=justify support ; also removed relic: GetMaxLineWidth

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 1b10e1a33b0c5bf40c9929f7546a45a8b4633dd0..c03471ff7a13a5996201afd34afeae8ebf96e792 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -62,7 +62,10 @@
     #endif
 
     // Place other OS/2 compiler environment defines here
-    #define LINKAGEMODE _Optlink
+    #if defined(__VISAGECPP__)
+        // VisualAge is the only thing that understands _Optlink
+        #define LINKAGEMODE _Optlink
+    #endif
 #else   // Windows
     #ifndef __WINDOWS__
         #define __WINDOWS__
@@ -331,11 +334,12 @@ typedef int wxWindowID;
 // stdcall is used for all functions called by Windows under Windows
 #ifdef __WINDOWS__
     #if defined(__GNUWIN32__)
-        #define wxCALLBACK __attribute__((stdcall))
+        #define wxSTDCALL __attribute__((stdcall))
     #else
         // both VC++ and Borland understand this
-        #define wxCALLBACK _stdcall
+        #define wxSTDCALL _stdcall
     #endif
+
 #else // Win
     // no such stupidness under Unix
     #define wxSTDCALL
@@ -1134,7 +1138,8 @@ enum wxStretch
 #define wxPD_AUTO_HIDE          0x0004
 #define wxPD_ELAPSED_TIME       0x0008
 #define wxPD_ESTIMATED_TIME     0x0010
-#define wxPD_REMAINING_TIME     0x0020
+// wxGA_SMOOTH = 0x0020 may also be used with wxProgressDialog
+#define wxPD_REMAINING_TIME     0x0040
 
 /*
  * wxHtmlWindow flags
@@ -1798,6 +1803,8 @@ typedef WXHWND WXWidget;
             #define FAR _far
         #endif
     #endif // no FAR
+#else // Win32
+    #define FAR
 #endif // Win16/32
 
 #endif // MSW