add wxFontEncoding member into wxNativeEncodingInfo

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

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index de51565a22979e29e2d8bd474265da4e4d6dcb31..6eb762401dee2c2ab914dc6be74546293ae0cb17 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -52,6 +52,7 @@
 struct WXDLLEXPORT wxNativeEncodingInfo
 {
     wxString facename;          // may be empty meaning "any"
+    wxFontEncoding encoding;    // so that we know what this struct represents
 
 #if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__)
     wxNativeEncodingInfo() { charset = 0; /* ANSI_CHARSET */ }

diff --git a/src/mac/carbon/fontutil.cpp b/src/mac/carbon/fontutil.cpp
index 4f61d13ff40a7a10b9f71a77498c6c8b71e5b6d7..49d08234bcbe103056b28e3fd43152fe024a98ea 100644 (file)
--- a/src/mac/carbon/fontutil.cpp
+++ b/src/mac/carbon/fontutil.cpp
@@ -150,6 +150,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
+    info->encoding = encoding;
+
     return TRUE;
 }
 

diff --git a/src/mac/fontutil.cpp b/src/mac/fontutil.cpp
index 4f61d13ff40a7a10b9f71a77498c6c8b71e5b6d7..49d08234bcbe103056b28e3fd43152fe024a98ea 100644 (file)
--- a/src/mac/fontutil.cpp
+++ b/src/mac/fontutil.cpp
@@ -150,6 +150,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
+    info->encoding = encoding;
+
     return TRUE;
 }
 

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index ecaeb8e2bcb959cb7bf716626cf103c63b724624..f75d090505e6b308b19f904cbf5cb90b11a1b281 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -158,6 +158,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
+    info->encoding = encoding;
+   
     return TRUE;
 }
 

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 19c96b3df6254ee78e75f2db8202db7068563398..db1939e352a72d3a9e63a0b54688b866093f9ded 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -206,6 +206,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
+   info->encoding = encoding;
+
     return TRUE;
 }