wxSpinCtrl

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index d6c84ee3b6d5a2812f88d9a46ac07c1c425e3c89..9f3858a2bdf8c409fc335baaedb4a4531453e9cd 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -6,76 +6,159 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

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

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

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "font.h"
+    #pragma implementation "font.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/font.h"
-#endif
+    #include <stdio.h>
+    #include "wx/setup.h"
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/font.h"
+#endif // WX_PRECOMP

 
 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"

-#include <assert.h>

 
 #if !USE_SHARED_LIBRARIES
 
 #if !USE_SHARED_LIBRARIES

-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

 
 

-#if wxUSE_PORTABLE_FONTS_IN_MSW
-IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
+    #if wxUSE_PORTABLE_FONTS_IN_MSW
+        IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
+    #endif

 #endif
 
 #endif
 

-#endif
+// ----------------------------------------------------------------------------
+// wxFontRefData - the internal description of the font
+// ----------------------------------------------------------------------------

 
 

-wxFontRefData::wxFontRefData(void)
+class WXDLLEXPORT wxFontRefData: public wxGDIRefData

 {
 {

-       m_style = 0;
-       m_temporary = FALSE;
-       m_pointSize = 0;
-       m_family = 0;
-       m_fontId = 0;
-       m_style = 0;
-       m_weight = 0;
-       m_underlined = 0;
-       m_faceName = "";
-       m_hFont = 0;
-}
+friend class WXDLLEXPORT wxFont;
+
+public:
+    wxFontRefData()
+    {
+        Init(12, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
+             "", wxFONTENCODING_DEFAULT);
+    }
+
+    wxFontRefData(const wxFontRefData& data)
+    {
+        Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
+             data.m_underlined, data.m_faceName, data.m_encoding);
+
+        m_fontId = data.m_fontId;
+    }

 
 

-wxFontRefData::wxFontRefData(const wxFontRefData& data)
+    wxFontRefData(int size,
+                  int family,
+                  int style,
+                  int weight,
+                  bool underlined,
+                  const wxString& faceName,
+                  wxFontEncoding encoding)
+    {
+        Init(size, family, style, weight, underlined, faceName, encoding);
+    }
+
+    virtual ~wxFontRefData();
+
+protected:
+    // common part of all ctors
+    void Init(int size,
+              int family,
+              int style,
+              int weight,
+              bool underlined,
+              const wxString& faceName,
+              wxFontEncoding encoding);
+
+    // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE
+    // DELETED by destructor
+    bool          m_temporary;
+
+    int           m_fontId;
+
+    // font characterstics
+    int           m_pointSize;
+    int           m_family;
+    int           m_style;
+    int           m_weight;
+    bool          m_underlined;
+    wxString      m_faceName;
+    wxFontEncoding m_encoding;
+
+    // Windows font handle
+    WXHFONT       m_hFont;
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
+
+void wxFontRefData::Init(int pointSize,
+                         int family,
+                         int style,
+                         int weight,
+                         bool underlined,
+                         const wxString& faceName,
+                         wxFontEncoding encoding)

 {
 {

-       m_style = data.m_style;
-       m_temporary = FALSE;
-       m_pointSize = data.m_pointSize;
-       m_family = data.m_family;
-       m_fontId = data.m_fontId;
-       m_style = data.m_style;
-       m_weight = data.m_weight;
-       m_underlined = data.m_underlined;
-       m_faceName = data.m_faceName;
-       m_hFont = 0;
+    m_style = style;
+    m_pointSize = pointSize;
+    m_family = family;
+    m_style = style;
+    m_weight = weight;
+    m_underlined = underlined;
+    m_faceName = faceName;
+    m_encoding = encoding;
+
+    m_fontId = 0;
+    m_temporary = FALSE;
+
+    m_hFont = 0;

 }
 
 }
 

-wxFontRefData::~wxFontRefData(void)
+wxFontRefData::~wxFontRefData()

 {
 {

-       if ( m_hFont )
-       ::DeleteObject((HFONT) m_hFont);
+    if ( m_hFont )
+    {
+        if ( !::DeleteObject((HFONT) m_hFont) )
+        {
+            wxLogLastError("DeleteObject(font)");
+        }
+    }

 }
 
 }
 

-wxFont::wxFont(void)
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------
+
+void wxFont::Init()

 {
     if ( wxTheFontList )
         wxTheFontList->Append(this);
 {
     if ( wxTheFontList )
         wxTheFontList->Append(this);


@@ -84,114 +167,157 @@ wxFont::wxFont(void)
 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */
 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */

-wxFont::wxFont(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName)
+bool wxFont::Create(int pointSize,
+                    int family,
+                    int style,
+                    int weight,
+                    bool underlined,
+                    const wxString& faceName,
+                    wxFontEncoding encoding)

 {
 {

-    Create(pointSize, family, style, weight, underlined, faceName);
+    UnRef();
+    m_refData = new wxFontRefData(pointSize, family, style, weight,
+                                  underlined, faceName, encoding);

 
 

-    if ( wxTheFontList )
-        wxTheFontList->Append(this);
-}
-
-bool wxFont::Create(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName)
-{
-  UnRef();
-  m_refData = new wxFontRefData;
-
-  M_FONTDATA->m_family = family;
-  M_FONTDATA->m_style = style;
-  M_FONTDATA->m_weight = weight;
-  M_FONTDATA->m_pointSize = pointSize;
-  M_FONTDATA->m_underlined = underlined;
-  M_FONTDATA->m_faceName = faceName;
-
-  RealizeResource();
+    RealizeResource();

 
 

-  return TRUE;
+    return TRUE;

 }
 
 wxFont::~wxFont()
 {
 }
 
 wxFont::~wxFont()
 {

-  if (wxTheFontList)
-    wxTheFontList->DeleteObject(this);
+    if ( wxTheFontList )
+        wxTheFontList->DeleteObject(this);

 }
 
 }
 

-bool wxFont::RealizeResource(void)
+// ----------------------------------------------------------------------------
+// real implementation
+// ----------------------------------------------------------------------------
+
+bool wxFont::RealizeResource()

 {
 {

-  if (M_FONTDATA && !M_FONTDATA->m_hFont)
-  {
-    BYTE ff_italic;
-    int ff_weight = 0;
+    if ( GetResourceHandle() )
+    {
+        // VZ: the old code returned FALSE in this case, but it doesn't seem
+        //     to make sense because the font _was_ created
+        wxLogDebug(wxT("Calling wxFont::RealizeResource() twice"));
+
+        return TRUE;
+    }
+

     int ff_family = 0;
     int ff_family = 0;

-    wxString ff_face("");
+    wxString ff_face;
+
+    switch ( M_FONTDATA->m_family )
+    {
+        case wxSCRIPT:
+            ff_family = FF_SCRIPT ;
+            ff_face = wxT("Script") ;
+            break ;
+
+        case wxDECORATIVE:
+            ff_family = FF_DECORATIVE;
+            break;
+
+        case wxROMAN:
+            ff_family = FF_ROMAN;
+            ff_face = wxT("Times New Roman") ;
+            break;
+
+        case wxTELETYPE:
+        case wxMODERN:
+            ff_family = FF_MODERN;
+            ff_face = wxT("Courier New") ;
+            break;
+
+        case wxSWISS:
+            ff_family = FF_SWISS;
+            ff_face = wxT("Arial") ;
+            break;
+
+        case wxDEFAULT:
+        default:
+            ff_family = FF_SWISS;
+            ff_face = wxT("Arial") ; 
+    }

 
 

-    switch (M_FONTDATA->m_family)
+    BYTE ff_italic;
+    switch ( M_FONTDATA->m_style )
+    {
+        case wxITALIC:
+        case wxSLANT:
+            ff_italic = 1;
+            break;
+
+        default:
+            wxFAIL_MSG(wxT("unknown font slant"));
+            // fall through
+
+        case wxNORMAL:
+            ff_italic = 0;
+    }
+
+    int ff_weight = 0;
+    switch ( M_FONTDATA->m_weight )

     {
     {

-      case wxSCRIPT:     ff_family = FF_SCRIPT ;
-                         ff_face = "Script" ;
-                         break ;
-      case wxDECORATIVE: ff_family = FF_DECORATIVE;
-                         break;
-      case wxROMAN:      ff_family = FF_ROMAN;
-                         ff_face = "Times New Roman" ;
-                         break;
-      case wxTELETYPE:
-      case wxMODERN:     ff_family = FF_MODERN;
-                         ff_face = "Courier New" ;
-                         break;
-      case wxSWISS:      ff_family = FF_SWISS;
-                         ff_face = "Arial";
-                         break;
-      case wxDEFAULT:
-      default:           ff_family = FF_SWISS;
-                         ff_face = "Arial" ; 
+        default:
+            wxFAIL_MSG(wxT("unknown font weight"));
+            // fall through
+
+        case wxNORMAL:
+            ff_weight = FW_NORMAL;
+            break;
+
+        case wxLIGHT:
+            ff_weight = FW_LIGHT;
+            break;
+
+        case wxBOLD:
+            ff_weight = FW_BOLD;
+            break;

     }
 
     }
 

-    if (M_FONTDATA->m_style == wxITALIC || M_FONTDATA->m_style == wxSLANT)
-      ff_italic = 1;
+    const wxChar* pzFace;
+    if ( M_FONTDATA->m_faceName.IsEmpty() )
+        pzFace = ff_face;

     else
     else

-      ff_italic = 0;
-
-    if (M_FONTDATA->m_weight == wxNORMAL)
-      ff_weight = FW_NORMAL;
-    else if (M_FONTDATA->m_weight == wxLIGHT)
-      ff_weight = FW_LIGHT;
-    else if (M_FONTDATA->m_weight == wxBOLD)
-      ff_weight = FW_BOLD;
-
-    const char* pzFace = (const char*) ff_face;
-    if (!M_FONTDATA->m_faceName.IsNull())
-        pzFace = (const char*) M_FONTDATA->m_faceName ;
-
-/* Always calculate fonts using the screen DC (is this the best strategy?)
- * There may be confusion if a font is selected into a printer
- * DC (say), because the height will be calculated very differently.
+        pzFace = M_FONTDATA->m_faceName ;
+
+#if 0
+    /* Always calculate fonts using the screen DC (is this the best strategy?)
+     * There may be confusion if a font is selected into a printer
+     * DC (say), because the height will be calculated very differently.
+     */

     // What sort of display is it?
     int technology = ::GetDeviceCaps(dc, TECHNOLOGY);
 
     int nHeight;
     // What sort of display is it?
     int technology = ::GetDeviceCaps(dc, TECHNOLOGY);
 
     int nHeight;

-    
+

     if (technology != DT_RASDISPLAY && technology != DT_RASPRINTER)
     {
     if (technology != DT_RASDISPLAY && technology != DT_RASPRINTER)
     {

-      // Have to get screen DC Caps, because a metafile will return 0.
-      HDC dc2 = ::GetDC(NULL);
-      nHeight = M_FONTDATA->m_pointSize*GetDeviceCaps(dc2, LOGPIXELSY)/72;
-      ::ReleaseDC(NULL, dc2);
+        // Have to get screen DC Caps, because a metafile will return 0.
+        HDC dc2 = ::GetDC(NULL);
+        nHeight = M_FONTDATA->m_pointSize*GetDeviceCaps(dc2, LOGPIXELSY)/72;
+        ::ReleaseDC(NULL, dc2);

     }
     else
     {
     }
     else
     {

-      nHeight = M_FONTDATA->m_pointSize*GetDeviceCaps(dc, LOGPIXELSY)/72;
+        nHeight = M_FONTDATA->m_pointSize*GetDeviceCaps(dc, LOGPIXELSY)/72;

     }
     }

-*/
+#endif // 0
+
+#if 0

     // Have to get screen DC Caps, because a metafile will return 0.
     HDC dc2 = ::GetDC(NULL);
     // Have to get screen DC Caps, because a metafile will return 0.
     HDC dc2 = ::GetDC(NULL);

-    int ppInch = ::GetDeviceCaps(dc2, LOGPIXELSY);
+    ppInch = ::GetDeviceCaps(dc2, LOGPIXELSY);

     ::ReleaseDC(NULL, dc2);
     ::ReleaseDC(NULL, dc2);

+#endif // 0
+
+    // New behaviour: apparently ppInch varies according to Large/Small Fonts
+    // setting in Windows. This messes up fonts. So, set ppInch to a constant
+    // 96 dpi.
+    static const int ppInch = 96;

 
 

-    // New behaviour: apparently ppInch varies according to
-    // Large/Small Fonts setting in Windows. This messes
-    // up fonts. So, set ppInch to a constant 96 dpi.
-    ppInch = 96;
-    

 #if wxFONT_SIZE_COMPATIBILITY
     // Incorrect, but compatible with old wxWindows behaviour
     int nHeight = (M_FONTDATA->m_pointSize*ppInch/72);
 #if wxFONT_SIZE_COMPATIBILITY
     // Incorrect, but compatible with old wxWindows behaviour
     int nHeight = (M_FONTDATA->m_pointSize*ppInch/72);


@@ -200,58 +326,146 @@ bool wxFont::RealizeResource(void)
     int nHeight = - (M_FONTDATA->m_pointSize*ppInch/72);
 #endif
 
     int nHeight = - (M_FONTDATA->m_pointSize*ppInch/72);
 #endif
 

-    bool ff_underline = M_FONTDATA->m_underlined;
+    BYTE ff_underline = M_FONTDATA->m_underlined;

 
 

-    M_FONTDATA->m_hFont = (WXHFONT) CreateFont(nHeight, 0, 0, 0,ff_weight,ff_italic,(BYTE)ff_underline,
-                0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
-                PROOF_QUALITY, DEFAULT_PITCH | ff_family, pzFace);
-#ifdef WXDEBUG_CREATE
-    if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ;
-#endif
-    return (M_FONTDATA->m_hFont != (WXHFONT) NULL);
-  }
-  return FALSE;
+    wxFontEncoding encoding = M_FONTDATA->m_encoding;
+    if ( encoding == wxFONTENCODING_DEFAULT )
+    {
+        encoding = wxFont::GetDefaultEncoding();
+    }
+
+    DWORD charset;
+    switch ( encoding )
+    {
+        case wxFONTENCODING_ISO8859_1:
+        case wxFONTENCODING_ISO8859_15:
+        case wxFONTENCODING_CP1250:
+            charset = ANSI_CHARSET;
+            break;
+
+        case wxFONTENCODING_ISO8859_2:
+        case wxFONTENCODING_CP1252:
+            charset = EASTEUROPE_CHARSET;
+            break;
+
+        case wxFONTENCODING_ISO8859_4:
+        case wxFONTENCODING_ISO8859_10:
+            charset = BALTIC_CHARSET;
+            break;
+
+        case wxFONTENCODING_ISO8859_5:
+        case wxFONTENCODING_CP1251:
+            charset = RUSSIAN_CHARSET;
+            break;
+
+        case wxFONTENCODING_ISO8859_6:
+            charset = ARABIC_CHARSET;
+            break;
+
+        case wxFONTENCODING_ISO8859_7:
+            charset = GREEK_CHARSET;
+            break;
+
+        case wxFONTENCODING_ISO8859_8:
+            charset = HEBREW_CHARSET;
+            break;
+
+        case wxFONTENCODING_ISO8859_9:
+            charset = TURKISH_CHARSET;
+            break;
+
+        case wxFONTENCODING_ISO8859_11:
+            charset = THAI_CHARSET;
+            break;
+
+        case wxFONTENCODING_CP437:
+            charset = OEM_CHARSET;
+            break;
+
+        default:
+            wxFAIL_MSG(wxT("unsupported encoding"));
+            // fall through
+
+        case wxFONTENCODING_SYSTEM:
+            charset = ANSI_CHARSET;
+    }
+
+    HFONT hFont = ::CreateFont
+                  (
+                   nHeight,             // height
+                   0,                   // width (choose best)
+                   0,                   // escapement
+                   0,                   // orientation
+                   ff_weight,           // weight
+                   ff_italic,           // italic?
+                   ff_underline,        // underlined?
+                   0,                   // strikeout?
+                   charset,             // charset
+                   OUT_DEFAULT_PRECIS,  // precision
+                   CLIP_DEFAULT_PRECIS, // clip precision
+                   PROOF_QUALITY,       // quality of match
+                   DEFAULT_PITCH |      // fixed or variable
+                   ff_family,           // family id
+                   pzFace               // face name
+                  );
+
+    M_FONTDATA->m_hFont = (WXHFONT)hFont;
+    if ( !hFont )
+    {
+        wxLogLastError("CreateFont");
+    }
+
+    return hFont != 0;

 }
 
 bool wxFont::FreeResource(bool force)
 {
 }
 
 bool wxFont::FreeResource(bool force)
 {

-  if (M_FONTDATA && M_FONTDATA->m_hFont)
-  {
-    ::DeleteObject((HFONT) M_FONTDATA->m_hFont);
-    M_FONTDATA->m_hFont = 0;
-    return TRUE;
-  }
-  return FALSE;
+    if ( GetResourceHandle() )
+    {
+        if ( !::DeleteObject((HFONT) M_FONTDATA->m_hFont) )
+        {
+            wxLogLastError("DeleteObject(font)");
+        }
+
+        M_FONTDATA->m_hFont = 0;
+
+        return TRUE;
+    }
+    return FALSE;

 }
 
 WXHANDLE wxFont::GetResourceHandle()
 {
 }
 
 WXHANDLE wxFont::GetResourceHandle()
 {

-  if ( !M_FONTDATA )
-       return 0;
-  else
-    return (WXHANDLE)M_FONTDATA->m_hFont ;
+    if ( !M_FONTDATA )
+        return 0;
+    else
+        return (WXHANDLE)M_FONTDATA->m_hFont ;

 }
 
 bool wxFont::IsFree() const
 {
 }
 
 bool wxFont::IsFree() const
 {

-  return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));
+    return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));

 }
 
 void wxFont::Unshare()
 {
 }
 
 void wxFont::Unshare()
 {

-       // Don't change shared data
-       if (!m_refData)
+    // Don't change shared data
+    if ( !m_refData )

     {
     {

-               m_refData = new wxFontRefData();
-       }
+        m_refData = new wxFontRefData();
+    }

     else
     {
     else
     {

-               wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
-               UnRef();
-               m_refData = ref;
-       }
+        wxFontRefData* ref = new wxFontRefData(*M_FONTDATA);
+        UnRef();
+        m_refData = ref;
+    }

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// change font attribute: we recreate font when doing it
+// ----------------------------------------------------------------------------
+

 void wxFont::SetPointSize(int pointSize)
 {
     Unshare();
 void wxFont::SetPointSize(int pointSize)
 {
     Unshare();


@@ -306,77 +520,58 @@ void wxFont::SetUnderlined(bool underlined)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-wxString wxFont::GetFamilyString(void) const
+void wxFont::SetEncoding(wxFontEncoding encoding)
+{
+    Unshare();
+
+    M_FONTDATA->m_encoding = encoding;
+
+    RealizeResource();
+}
+
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
+int wxFont::GetPointSize() const
+{
+    return M_FONTDATA->m_pointSize;
+}
+
+int wxFont::GetFamily() const
+{
+    return M_FONTDATA->m_family;
+}
+
+int wxFont::GetFontId() const

 {
 {

-  wxString fam("");
-  switch (GetFamily())
-  {
-    case wxDECORATIVE:
-      fam = "wxDECORATIVE";
-      break;
-    case wxROMAN:
-      fam = "wxROMAN";
-      break;
-    case wxSCRIPT:
-      fam = "wxSCRIPT";
-      break;
-    case wxSWISS:
-      fam = "wxSWISS";
-      break;
-    case wxMODERN:
-      fam = "wxMODERN";
-      break;
-    case wxTELETYPE:
-      fam = "wxTELETYPE";
-      break;
-    default:
-      fam = "wxDEFAULT";
-      break;
-  }
-  return fam;
+    return M_FONTDATA->m_fontId;

 }
 
 }
 

-wxString wxFont::GetFaceName(void) const
+int wxFont::GetStyle() const

 {
 {

-  wxString str("");
-  if (M_FONTDATA)
-       str = M_FONTDATA->m_faceName ;
-  return str;
+    return M_FONTDATA->m_style;

 }
 
 }
 

-wxString wxFont::GetStyleString(void) const
+int wxFont::GetWeight() const

 {
 {

-  wxString styl("");
-  switch (GetStyle())
-  {
-    case wxITALIC:
-      styl = "wxITALIC";
-      break;
-    case wxSLANT:
-      styl = "wxSLANT";
-      break;
-    default:
-      styl = "wxNORMAL";
-      break;
-  }
-  return styl;
+    return M_FONTDATA->m_weight;

 }
 
 }
 

-wxString wxFont::GetWeightString(void) const
+bool wxFont::GetUnderlined() const

 {
 {

-  wxString w("");
-  switch (GetWeight())
-  {
-    case wxBOLD:
-      w = "wxBOLD";
-      break;
-    case wxLIGHT:
-      w = "wxLIGHT";
-      break;
-    default:
-      w = "wxNORMAL";
-      break;
-  }
-  return w;
+    return M_FONTDATA->m_underlined;

 }
 
 }
 

+wxString wxFont::GetFaceName() const
+{
+    wxString str;
+    if ( M_FONTDATA )
+        str = M_FONTDATA->m_faceName ;
+    return str;
+}
+
+wxFontEncoding wxFont::GetEncoding() const
+{
+    return M_FONTDATA->m_encoding;
+}