fix for wxSYS_COLOUR_LISTBOX representation

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index b15c904cc83232feb1056c3e90a0fff9fe881b9f..c489e93c645a4bec6d94c866ab3a8f7a49ad7093 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -1,328 +1,162 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlg.cpp
+// Name:        src/msw/fontdlg.cpp

 // Purpose:     wxFontDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Purpose:     wxFontDialog class
 // Author:      Julian Smart
 // Modified by:
 // 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 "fontdlg.h"
+    #pragma implementation "fontdlg.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
 
 #endif
 

+#if wxUSE_FONTDLG
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
+    #include "wx/defs.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"

 #endif
 
 #include "wx/fontdlg.h"
 
 #endif
 
 #include "wx/fontdlg.h"
 

-#include <windows.h>
-

 #if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
 #if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)

-#include <commdlg.h>
+    #include <commdlg.h>

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

+#include "wx/log.h"

 
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
 
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 

-#define wxDIALOG_DEFAULT_X 300
-#define wxDIALOG_DEFAULT_Y 300
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)

-#endif

 
 

-/*
- * wxFontDialog
- */
+// ============================================================================
+// implementation
+// ============================================================================

 
 

+// ----------------------------------------------------------------------------
+// wxFontDialog
+// ----------------------------------------------------------------------------

 
 

-wxFontDialog::wxFontDialog(void)
+wxFontDialog::wxFontDialog()

 {
 {

-  m_dialogParent = NULL;
+    m_parent = NULL;

 }
 
 wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
 {
 }
 
 wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
 {

-  Create(parent, data);
+    Create(parent, data);

 }
 
 bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
 {
 }
 
 bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
 {

-  m_dialogParent = parent;
+    m_parent = parent;
+
+    wxCHECK_MSG( data, FALSE, _T("no font data in wxFontDialog") );

 
 

-  if (data)

     m_fontData = *data;
     m_fontData = *data;

-  return TRUE;
+
+    return TRUE;

 }
 
 }
 

-int wxFontDialog::ShowModal(void)
+int wxFontDialog::ShowModal()

 {
 {

-    CHOOSEFONT chooseFontStruct;
-    LOGFONT logFont;
+    DWORD flags = CF_SCREENFONTS | CF_NOSIMULATIONS;

 
 

-    DWORD flags = CF_TTONLY | CF_SCREENFONTS | CF_NOSIMULATIONS;
+    LOGFONT logFont;

 
 

-    memset(&chooseFontStruct, 0, sizeof(CHOOSEFONT));
+    CHOOSEFONT chooseFontStruct;
+    wxZeroMemory(chooseFontStruct);

 
     chooseFontStruct.lStructSize = sizeof(CHOOSEFONT);
 
     chooseFontStruct.lStructSize = sizeof(CHOOSEFONT);

-    chooseFontStruct.hwndOwner = (HWND) (m_dialogParent ? (HWND) m_dialogParent->GetHWND() : NULL);
+    if ( m_parent )
+        chooseFontStruct.hwndOwner = GetHwndOf(m_parent);

     chooseFontStruct.lpLogFont = &logFont;
 
     chooseFontStruct.lpLogFont = &logFont;
 

-    if (m_fontData.initialFont.Ok())
+    if ( m_fontData.initialFont.Ok() )

     {
     {

-      flags |= CF_INITTOLOGFONTSTRUCT;
-      wxFillLogFont(&logFont, & m_fontData.initialFont);
+        flags |= CF_INITTOLOGFONTSTRUCT;
+        wxFillLogFont(&logFont, &m_fontData.initialFont);

     }
 
     }
 

-    chooseFontStruct.iPointSize = 0;
-    chooseFontStruct.rgbColors = RGB((BYTE)m_fontData.fontColour.Red(), (BYTE)m_fontData.fontColour.Green(), (BYTE)m_fontData.fontColour.Blue());
+    chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.fontColour);

 
 

-    if (!m_fontData.GetAllowSymbols())
-      flags |= CF_ANSIONLY;
-    if (m_fontData.GetEnableEffects())
-      flags |= CF_EFFECTS;
-    if (m_fontData.GetShowHelp())
-      flags |= CF_SHOWHELP;
-    if (!(m_fontData.minSize == 0 && m_fontData.maxSize == 0))
+    // CF_ANSIONLY flag is obsolete for Win32
+    if ( !m_fontData.GetAllowSymbols() )

     {
     {

-      chooseFontStruct.nSizeMin = m_fontData.minSize;
-      chooseFontStruct.nSizeMax = m_fontData.maxSize;
-      flags |= CF_LIMITSIZE;
+#ifdef __WIN16__
+      flags |= CF_ANSIONLY;
+#else // Win32
+      flags |= CF_SELECTSCRIPT;
+      logFont.lfCharSet = ANSI_CHARSET;
+#endif // Win16/32

     }
 
     }
 

-    chooseFontStruct.Flags = flags;
-    chooseFontStruct.nFontType = SCREEN_FONTTYPE;
-    bool success = (ChooseFont(&(chooseFontStruct)) != 0);
+    if ( m_fontData.GetEnableEffects() )
+      flags |= CF_EFFECTS;
+    if ( m_fontData.GetShowHelp() )
+      flags |= CF_SHOWHELP;

 
 

-    // Restore values
-    if (success)
+    if ( m_fontData.minSize != 0 || m_fontData.maxSize != 0 )

     {
     {

-      m_fontData.fontColour.Set(GetRValue(chooseFontStruct.rgbColors), GetGValue(chooseFontStruct.rgbColors),
-       GetBValue(chooseFontStruct.rgbColors));
-      m_fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
+        chooseFontStruct.nSizeMin = m_fontData.minSize;
+        chooseFontStruct.nSizeMax = m_fontData.maxSize;
+        flags |= CF_LIMITSIZE;

     }
 
     }
 

-    return success ? wxID_OK : wxID_CANCEL;
-}
-
-void wxFillLogFont(LOGFONT *logFont, wxFont *font)
-{
-    BYTE ff_italic;
-    int ff_weight = 0;
-    int ff_family = 0;
-    wxString ff_face("");
+    chooseFontStruct.Flags = flags;

 
 

-    switch (font->GetFamily())
+    if ( ChooseFont(&chooseFontStruct) != 0 )

     {
     {

-      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 = "MS Sans Serif" ;
-    }
-
-    if (font->GetStyle() == wxITALIC || font->GetStyle() == wxSLANT)
-      ff_italic = 1;
-    else
-      ff_italic = 0;
-
-    if (font->GetWeight() == wxNORMAL)
-      ff_weight = FW_NORMAL;
-    else if (font->GetWeight() == wxLIGHT)
-      ff_weight = FW_LIGHT;
-    else if (font->GetWeight() == wxBOLD)
-      ff_weight = FW_BOLD;
-
-    // Have to get screen DC Caps, because a metafile will return 0.
-    HDC dc2 = ::GetDC(NULL);
-    int ppInch = ::GetDeviceCaps(dc2, LOGPIXELSY);
-    ::ReleaseDC(NULL, dc2);
-
-    // 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 = (font->GetPointSize()*ppInch/72);
-#else
-    // Correct for Windows compatibility
-    int nHeight = - (font->GetPointSize()*ppInch/72);
-#endif
-
-    bool ff_underline = font->GetUnderlined();
-
-    ff_face = font->GetFaceName();
-
-    logFont->lfHeight = nHeight;
-    logFont->lfWidth = 0;
-    logFont->lfEscapement = 0;
-    logFont->lfOrientation = 0;
-    logFont->lfWeight = ff_weight;
-    logFont->lfItalic = ff_italic;
-    logFont->lfUnderline = (BYTE)ff_underline;
-    logFont->lfStrikeOut = 0;
-    logFont->lfCharSet = wxCharsetFromEncoding(font->GetEncoding());
-    logFont->lfOutPrecision = OUT_DEFAULT_PRECIS;
-    logFont->lfClipPrecision = CLIP_DEFAULT_PRECIS;
-    logFont->lfQuality = PROOF_QUALITY;
-    logFont->lfPitchAndFamily = DEFAULT_PITCH | ff_family;
-    wxStrcpy(logFont->lfFaceName, ff_face);
-}
+        wxRGBToColour(m_fontData.fontColour, chooseFontStruct.rgbColors);
+        m_fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
+        m_fontData.EncodingInfo().facename = logFont.lfFaceName;
+        m_fontData.EncodingInfo().charset = logFont.lfCharSet;

 
 

-wxFont wxCreateFontFromLogFont(LOGFONT *logFont)
-{
-    int fontFamily = wxSWISS;
-    int fontStyle = wxNORMAL;
-    int fontWeight = wxNORMAL;
-    int fontPoints = 10;
-    bool fontUnderline = FALSE;
-    wxChar *fontFace = NULL;
-
-    int lfFamily = logFont->lfPitchAndFamily;
-    if (lfFamily & FIXED_PITCH)
-        lfFamily -= FIXED_PITCH;
-    if (lfFamily & VARIABLE_PITCH)
-        lfFamily -= VARIABLE_PITCH;
-
-    switch (lfFamily)
-    {
-        case FF_ROMAN:
-            fontFamily = wxROMAN;
-            break;
-        case FF_SWISS:
-            fontFamily = wxSWISS;
-            break;
-        case FF_SCRIPT:
-            fontFamily = wxSCRIPT;
-            break;
-        case FF_MODERN:
-            fontFamily = wxMODERN;
-            break;
-        case FF_DECORATIVE:
-            fontFamily = wxDECORATIVE;
-            break;
-        default:
-            fontFamily = wxSWISS;
-            break;
-    }
-    switch (logFont->lfWeight)
-    {
-        case FW_LIGHT:
-            fontWeight = wxLIGHT;
-            break;
-        case FW_NORMAL:
-            fontWeight = wxNORMAL;
-            break;
-        case FW_BOLD:
-            fontWeight = wxBOLD;
-            break;
-        default:
-            fontWeight = wxNORMAL;
-            break;
+        return wxID_OK;

     }
     }

-    if (logFont->lfItalic)
-        fontStyle = wxITALIC;

     else
     else

-        fontStyle = wxNORMAL;
-
-    if (logFont->lfUnderline)
-        fontUnderline = TRUE;
-
-    if  (logFont->lfFaceName)
-        fontFace = logFont->lfFaceName;
-
-    wxFontEncoding fontEncoding;
-    switch ( logFont->lfCharSet )

     {
     {

-        default:
-            wxFAIL_MSG(wxT("unsupported charset"));
-            // fall through
-
-        case ANSI_CHARSET:
-            fontEncoding = wxFONTENCODING_ISO8859_1;
-            break;
-
-        case EASTEUROPE_CHARSET:
-            fontEncoding = wxFONTENCODING_ISO8859_2;
-            break;
-
-        case BALTIC_CHARSET:
-            fontEncoding = wxFONTENCODING_ISO8859_4;
-            break;
-
-        case RUSSIAN_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1251;
-            break;
-
-        case ARABIC_CHARSET:
-            fontEncoding = wxFONTENCODING_ISO8859_6;
-            break;
-
-        case GREEK_CHARSET:
-            fontEncoding = wxFONTENCODING_ISO8859_7;
-            break;
-
-        case HEBREW_CHARSET:
-            fontEncoding = wxFONTENCODING_ISO8859_8;
-            break;
-
-        case TURKISH_CHARSET:
-            fontEncoding = wxFONTENCODING_ISO8859_9;
-            break;
-
-        case THAI_CHARSET:
-            fontEncoding = wxFONTENCODING_ISO8859_11;
-            break;
-
+        // common dialog failed - why?
+#ifdef __WXDEBUG__
+        DWORD dwErr = CommDlgExtendedError();
+        if ( dwErr != 0 )
+        {
+            // this msg is only for developers
+            wxLogError(wxT("Common dialog failed with error code %0lx."),
+                       dwErr);
+        }
+        //else: it was just cancelled
+#endif

 
 

-        case OEM_CHARSET:
-            fontEncoding = wxFONTENCODING_CP437;
-            break;
+        return wxID_CANCEL;

     }
     }

-
-    HDC dc2 = ::GetDC(NULL);
-
-    if ( logFont->lfHeight < 0 )
-        logFont->lfHeight = - logFont->lfHeight;
-    fontPoints = abs(72*logFont->lfHeight/GetDeviceCaps(dc2, LOGPIXELSY));
-    ::ReleaseDC(NULL, dc2);
-
-    return wxFont(fontPoints, fontFamily, fontStyle,
-                  fontWeight, fontUnderline, fontFace,
-                  fontEncoding);

 }
 
 }
 

-
+#endif // wxUSE_FONTDLG