Make wxTopLevelWindow::GetDefaultSize() public and document it.

[wxWidgets.git] / interface / wx / font.h

diff --git a/interface/wx/font.h b/interface/wx/font.h
index a4283059b04279831ce8c50186ada7d5b18d2fe0..f9e22b306b7a8f45da68f118db426d8ff02c003b 100644 (file)
--- a/interface/wx/font.h
+++ b/interface/wx/font.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxFont
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxFont
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -237,13 +237,10 @@ enum wxFontEncoding
     /// (this is used by wxEncodingConverter and wxUTFFile only for now)
     wxFONTENCODING_UNICODE,
 
     /// (this is used by wxEncodingConverter and wxUTFFile only for now)
     wxFONTENCODING_UNICODE,
 

-    // alternative names for Far Eastern encodings
-    // Chinese

     wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, //!< Simplified Chinese
     wxFONTENCODING_BIG5 = wxFONTENCODING_CP950,   //!< Traditional Chinese
     wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, //!< Simplified Chinese
     wxFONTENCODING_BIG5 = wxFONTENCODING_CP950,   //!< Traditional Chinese

-
-        // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html)
-    wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932 //!< Shift JIS
+    wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932, //!< Shift JIS
+    wxFONTENCODING_EUC_KR = wxFONTENCODING_CP949 //!< Korean

 };
 
 
 };
 
 


@@ -537,7 +534,7 @@ public:
     //@{
 
     /**
     //@{
 
     /**

-        Return a bold version of this font.
+        Returns a bold version of this font.

 
         @see MakeBold()
 
 
         @see MakeBold()
 


@@ -546,7 +543,7 @@ public:
     wxFont Bold() const;
 
     /**
     wxFont Bold() const;
 
     /**

-        Return an italic version of this font.
+        Returns an italic version of this font.

 
         @see MakeItalic()
 
 
         @see MakeItalic()
 


@@ -555,17 +552,29 @@ public:
     wxFont Italic() const;
 
     /**
     wxFont Italic() const;
 
     /**

-        Return a larger version of this font.
+        Returns a larger version of this font.

 
 

-        The font size is multiplied by CSS specification inspired factor of @c
-        1.2.
+        The font size is multiplied by @c 1.2, the factor of @c 1.2 being
+        inspired by the W3C CSS specification.

 
 

-        @see Larger(), MakeSmaller(), Scale()
+        @see MakeLarger(), Smaller(), Scaled()

 
         @since 2.9.1
      */
     wxFont Larger() const;
 
 
         @since 2.9.1
      */
     wxFont Larger() const;
 

+    /**
+        Returns a smaller version of this font.
+
+        The font size is divided by @c 1.2, the factor of @c 1.2 being
+        inspired by the W3C CSS specification.
+
+        @see MakeSmaller(), Larger(), Scaled()
+
+        @since 2.9.1
+     */
+    wxFont Smaller() const;
+

     /**
         Changes this font to be bold.
 
     /**
         Changes this font to be bold.
 


@@ -587,8 +596,8 @@ public:
     /**
         Changes this font to be larger.
 
     /**
         Changes this font to be larger.
 

-        The font size is multiplied by CSS specification inspired factor of @c
-        1.2.
+        The font size is multiplied by @c 1.2, the factor of @c 1.2 being
+        inspired by the W3C CSS specification.

 
         @see Larger(), MakeSmaller(), Scale()
 
 
         @see Larger(), MakeSmaller(), Scale()
 


@@ -597,12 +606,12 @@ public:
     wxFont& MakeLarger();
 
     /**
     wxFont& MakeLarger();
 
     /**

-        Return a smaller version of this font.
+        Changes this font to be smaller.

 
 

-        The font size is divided by CSS specification inspired factor of @c
-        1.2.
+        The font size is divided by @c 1.2, the factor of @c 1.2 being
+        inspired by the W3C CSS specification.

 
 

-        @see MakeLarger(), Scale(), Smaller()
+        @see Smaller(), MakeLarger(), Scale()

 
         @since 2.9.1
      */
 
         @since 2.9.1
      */


@@ -621,7 +630,7 @@ public:
     wxFont& Scale(float x);
 
     /**
     wxFont& Scale(float x);
 
     /**

-        Return a scaled version of this font.
+        Returns a scaled version of this font.

 
         The font size is multiplied by the given factor (which may be less than
         1 to create a smaller version of the font).
 
         The font size is multiplied by the given factor (which may be less than
         1 to create a smaller version of the font).


@@ -632,18 +641,6 @@ public:
      */
     wxFont Scaled(float x) const;
 
      */
     wxFont Scaled(float x) const;
 

-    /**
-        Return a smaller version of this font.
-
-        The font size is divided by CSS specification inspired factor of @c
-        1.2.
-
-        @see Larger(), MakeSmaller(), Scaled()
-
-        @since 2.9.1
-     */
-    wxFont Smaller() const;
-

     //@}
 
     /**
     //@}
 
     /**