Added list style to text attributes, independent from paragraph style

[wxWidgets.git] / src / os2 / dcclient.cpp

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index 74264492a43e35788d0f68dabecfa67de49b6e00..b811e9a8df439eaf4b8c6ed84840f070eaaa5a6f 100644 (file)
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.cpp
+// Name:        src/os2/dcclient.cpp

 // Purpose:     wxClientDC class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxClientDC class
 // Author:      David Webster
 // Modified by:


@@ -20,14 +20,16 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/string.h"
-#include "wx/log.h"
-#include "wx/window.h"
-#include "wx/app.h"
+#include "wx/dcclient.h"

 
 

-#include "wx/os2/private.h"
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/window.h"
+#endif

 
 

-#include "wx/dcclient.h"
+#include "wx/os2/private.h"

 
 // ----------------------------------------------------------------------------
 // array/list types
 
 // ----------------------------------------------------------------------------
 // array/list types


@@ -70,7 +72,7 @@ static RECT        g_paintStruct;
 #ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only
     // created in resopnse to WM_PAINT message - doing this from elsewhere is a
 #ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only
     // created in resopnse to WM_PAINT message - doing this from elsewhere is a

-    // common programming error among wxWindows programmers and might lead to
+    // common programming error among wxWidgets programmers and might lead to

     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
 #endif // __WXDEBUG__
     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
 #endif // __WXDEBUG__


@@ -86,6 +88,8 @@ static RECT        g_paintStruct;
 wxWindowDC::wxWindowDC()
 {
     m_pCanvas = NULL;
 wxWindowDC::wxWindowDC()
 {
     m_pCanvas = NULL;

+    m_PageSize.cx = m_PageSize.cy = 0;
+

 }
 
 wxWindowDC::wxWindowDC(
 }
 
 wxWindowDC::wxWindowDC(


@@ -94,8 +98,12 @@ wxWindowDC::wxWindowDC(
 {
     ERRORID                         vError;
     wxString                        sError;
 {
     ERRORID                         vError;
     wxString                        sError;

+    int                             nWidth, nHeight;

 
     m_pCanvas = pTheCanvas;
 
     m_pCanvas = pTheCanvas;

+    DoGetSize(&nWidth, &nHeight);
+    m_PageSize.cx = nWidth;
+    m_PageSize.cy = nHeight;

     m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) );
 
     //
     m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) );
 
     //


@@ -109,11 +117,17 @@ wxWindowDC::wxWindowDC(
                            ,&m_PageSize
                            ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                           );
                            ,&m_PageSize
                            ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                           );

+    if (!m_hPS)
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError(_T("Unable to create presentation space. Error: %s\n"), sError.c_str());
+    }

     ::GpiAssociate(m_hPS, NULLHANDLE);
     ::GpiAssociate(m_hPS, m_hDC);
 
     //
     ::GpiAssociate(m_hPS, NULLHANDLE);
     ::GpiAssociate(m_hPS, m_hDC);
 
     //

-    // Set the wxWindows color table
+    // Set the wxWidgets color table

     //
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
     //
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L


@@ -125,7 +139,7 @@ wxWindowDC::wxWindowDC(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError("Unable to set current color table. Error: %s\n", sError);
+        wxLogError(_T("Unable to set current color table (3). Error: %s\n"), sError.c_str());

     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L


@@ -142,12 +156,7 @@ wxWindowDC::wxWindowDC(
 
 void wxWindowDC::InitDC()
 {
 
 void wxWindowDC::InitDC()
 {

-    wxColour                        vColor;

 
 

-    vColor.InitFromName("BLACK");
-    m_pen.SetColour(vColor);
-    vColor.Set("WHITE");
-    m_brush.SetColour(vColor);

     //
     // The background mode is only used for text background and is set in
     // DrawText() to OPAQUE as required, otherwise always TRANSPARENT,
     //
     // The background mode is only used for text background and is set in
     // DrawText() to OPAQUE as required, otherwise always TRANSPARENT,


@@ -158,8 +167,31 @@ void wxWindowDC::InitDC()
     // Default bg colour is pne of the window
     //
     SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
     // Default bg colour is pne of the window
     //
     SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));

+
+    m_pen.SetColour(*wxBLACK);
+    m_brush.SetColour(*wxWHITE);
+    InitializePalette();
+    wxFont* pFont = new wxFont( 10, wxMODERN, wxNORMAL, wxBOLD );
+    SetFont(*pFont);
+    delete pFont;
+    //
+    // OS/2 default vertical character alignment needs to match the other OS's
+    //
+    ::GpiSetTextAlignment((HPS)GetHPS(), TA_NORMAL_HORIZ, TA_BOTTOM);
+

 } // end of wxWindowDC::InitDC
 
 } // end of wxWindowDC::InitDC
 

+void wxWindowDC::DoGetSize(
+  int*                              pnWidth
+, int*                              pnHeight
+) const
+{
+    wxCHECK_RET( m_pCanvas, _T("wxWindowDC without a window?") );
+    m_pCanvas->GetSize( pnWidth
+                       ,pnHeight
+                      );
+} // end of wxWindowDC::DoGetSize
+

 // ----------------------------------------------------------------------------
 // wxClientDC
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxClientDC
 // ----------------------------------------------------------------------------


@@ -189,7 +221,7 @@ wxClientDC::wxClientDC(
                           ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                          );
 
                           ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                          );
 

-    // Set the wxWindows color table
+    // Set the wxWidgets color table

     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
                                   ,LCOLF_CONSECRGB
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
                                   ,LCOLF_CONSECRGB


@@ -200,7 +232,7 @@ wxClientDC::wxClientDC(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError("Unable to set current color table. Error: %s\n", sError);
+        wxLogError(_T("Unable to set current color table (4). Error: %s\n"), sError.c_str());

     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L


@@ -241,6 +273,17 @@ wxClientDC::~wxClientDC()
 {
 } // end of wxClientDC::~wxClientDC
 
 {
 } // end of wxClientDC::~wxClientDC
 

+void wxClientDC::DoGetSize(
+  int*                              pnWidth
+, int*                              pnHeight
+) const
+{
+    wxCHECK_RET( m_pCanvas, _T("wxWindowDC without a window?") );
+    m_pCanvas->GetClientSize( pnWidth
+                             ,pnHeight
+                            );
+} // end of wxClientDC::DoGetSize
+

 // ----------------------------------------------------------------------------
 // wxPaintDC
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPaintDC
 // ----------------------------------------------------------------------------


@@ -283,12 +326,14 @@ wxPaintDC::wxPaintDC(
     {
         HPS                         hPS;
 
     {
         HPS                         hPS;
 

+        m_hDC = ::WinOpenWindowDC(GetWinHwnd(m_pCanvas));

         hPS = ::WinBeginPaint( GetWinHwnd(m_pCanvas)
                               ,NULLHANDLE
                               ,&g_paintStruct
                              );
         if(hPS)
         {
         hPS = ::WinBeginPaint( GetWinHwnd(m_pCanvas)
                               ,NULLHANDLE
                               ,&g_paintStruct
                              );
         if(hPS)
         {

+            ::GpiAssociate(hPS, m_hDC);

             m_hOldPS = m_hPS;
             m_hPS = hPS;
             ::GpiCreateLogColorTable( m_hPS
             m_hOldPS = m_hPS;
             m_hPS = hPS;
             ::GpiCreateLogColorTable( m_hPS


@@ -312,8 +357,7 @@ wxPaintDC::wxPaintDC(
                                 );
         }
 
                                 );
         }
 

-        m_bIsPaintTime   = TRUE;
-        m_hDC = (WXHDC) -1; // to satisfy those anonizmous efforts
+        m_bIsPaintTime   = true;

         ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this));
     }
     InitDC();
         ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this));
     }
     InitDC();


@@ -334,7 +378,7 @@ wxPaintDC::~wxPaintDC()
         {
             ::WinEndPaint(m_hPS);
             m_hPS          = m_hOldPS;
         {
             ::WinEndPaint(m_hPS);
             m_hPS          = m_hOldPS;

-            m_bIsPaintTime = FALSE;
+            m_bIsPaintTime = false;

             ms_cache.RemoveAt(nIndex);
         }
         //else: cached DC entry is still in use
             ms_cache.RemoveAt(nIndex);
         }
         //else: cached DC entry is still in use


@@ -382,4 +426,3 @@ WXHDC wxPaintDC::FindDCInCache(
     }
     return 0;
 } // end of wxPaintDC::FindInCache
     }
     return 0;
 } // end of wxPaintDC::FindInCache

-