Small changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 60246b5f9d6a67d16a000aed92a1cefc58779166..b70a1f16798df1394ae6417ee6a3dfe09b9c8e7c 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -116,6 +116,7 @@ src/zlib/*.3
 src/zlib/*.mms
 
 include/wx/*.h
 src/zlib/*.mms
 
 include/wx/*.h

+include/wx/*.inl

 include/wx/*.cpp
 include/wx/protocol/*.h
 include/wx/wx_setup.vms
 include/wx/*.cpp
 include/wx/protocol/*.h
 include/wx/wx_setup.vms

diff --git a/include/wx/font.h b/include/wx/font.h
index cf30f6585dfa3798f6b245ddcab53f4bd9fdbeac..9b3b5f29cdb20568068f0f16ce7fe3ef29993727 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -105,6 +105,7 @@ enum wxFontEncoding
     wxFONTENCODING_CP855,           // another cyrillic encoding
     wxFONTENCODING_CP866,           // and another one
         // and for Windows
     wxFONTENCODING_CP855,           // another cyrillic encoding
     wxFONTENCODING_CP866,           // and another one
         // and for Windows

+    wxFONTENCODING_CP874,           // WinThai

     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
     wxFONTENCODING_CP1252,          // WinLatin1
     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
     wxFONTENCODING_CP1252,          // WinLatin1

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 87acd8294992d15a880c3ce47a3ae5e4cc1d1019..5fddec59b862b66dbd27b2dfcb99d61aeb37486b 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -143,6 +143,10 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         case wxFONTENCODING_CP1257:
             info->charset = BALTIC_CHARSET;
             break;
         case wxFONTENCODING_CP1257:
             info->charset = BALTIC_CHARSET;
             break;

+
+        case wxFONTENCODING_CP874:
+            info->charset = THAI_CHARSET;
+            break;

 #endif // !Win16
 
         case wxFONTENCODING_CP437:
 #endif // !Win16
 
         case wxFONTENCODING_CP437:


@@ -425,6 +429,10 @@ wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
         case TURKISH_CHARSET:
             fontEncoding = wxFONTENCODING_CP1254;
             break;
         case TURKISH_CHARSET:
             fontEncoding = wxFONTENCODING_CP1254;
             break;

+
+        case THAI_CHARSET:
+            fontEncoding = wxFONTENCODING_CP437;
+            break;

 #endif
 
         case OEM_CHARSET:
 #endif
 
         case OEM_CHARSET:

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index 690e86787c3c93f11f7dcf38a81752438000f3d4..7ff8790d7463173d86aac278c2fb9cba7b30bfce 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -113,7 +113,7 @@ SOURCE=.\common\ctrlsub.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\date.cpp
+SOURCE=.\common\datetime.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -407,10 +407,6 @@ SOURCE=.\common\textfile.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\time.cpp
-# End Source File
-# Begin Source File
-

 SOURCE=.\common\timercmn.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\timercmn.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index e9f76be312ebd760820dd30bd15212c233cf560f..e9e4e824b13e825ae32614f79208b1d3217482bf 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -120,7 +120,7 @@ SOURCE=.\common\ctrlsub.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\date.cpp
+SOURCE=.\common\datetime.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -410,10 +410,6 @@ SOURCE=.\common\textfile.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\common\time.cpp
-# End Source File
-# Begin Source File
-

 SOURCE=.\common\timercmn.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\timercmn.cpp
 # End Source File
 # Begin Source File