From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 8 Jan 2000 23:45:24 +0000 (+0000)
Subject: add wxFontEncoding member into wxNativeEncodingInfo
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6b0eebc537c0f96eab28295b4ae2c4e978a435a5?hp=3b61656e64355ba7bf4e2fd98e007512e3312c48

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 de51565a22..6eb762401d 100644
--- 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 4f61d13ff4..49d08234bc 100644
--- 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 4f61d13ff4..49d08234bc 100644
--- 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 ecaeb8e2bc..f75d090505 100644
--- 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 19c96b3df6..db1939e352 100644
--- 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;
 }