Get rid of the class naming conflict with the base header for Print and supress some...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index 9073078b2bb14d48c14bb89d25237a19ebc8905a..81afd6afc05e1eab6771a462e9b19dee287bc13d 100644 (file)
--- a/src/os2/print.cpp
+++ b/src/os2/print.cpp
@@ -24,29 +24,29 @@
 #include "wx/os2/print.h"
 #include "wx/generic/prntdlgg.h"
 
 #include "wx/os2/print.h"
 #include "wx/generic/prntdlgg.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
-IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
+IMPLEMENT_DYNAMIC_CLASS(wxOS2Printer, wxPrinterBase)
+IMPLEMENT_CLASS(wxOS2PrintPreview, wxPrintPreviewBase)

 
 /*
  * Printer
  */
 
 
 /*
  * Printer
  */
 

-wxPrinter::wxPrinter(wxPrintData *data):
+wxOS2Printer::wxOS2Printer(wxPrintData *data):

   wxPrinterBase((wxPrintDialogData*)data)
 {
 }
 
   wxPrinterBase((wxPrintDialogData*)data)
 {
 }
 

-wxPrinter::~wxPrinter()
+wxOS2Printer::~wxOS2Printer()

 {
 }
 
 {
 }
 

-bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
+bool wxOS2Printer::Print(wxWindow *parent, wxPrintout *printout, bool prompt)

 {
     // TODO. See wxPostScriptPrinter::Print for hints.
     return FALSE;
 }
 
 {
     // TODO. See wxPostScriptPrinter::Print for hints.
     return FALSE;
 }
 

-wxDC* wxPrinter::PrintDialog(wxWindow *parent)
+wxDC* wxOS2Printer::PrintDialog(wxWindow *parent)

 {
 // TODO:
 /*
 {
 // TODO:
 /*


@@ -56,7 +56,7 @@ wxDC* wxPrinter::PrintDialog(wxWindow *parent)
     return NULL;
 }
 
     return NULL;
 }
 

-bool wxPrinter::Setup(wxWindow *parent)
+bool wxOS2Printer::Setup(wxWindow *parent)

 {
 // TODO:
 /*
 {
 // TODO:
 /*


@@ -71,17 +71,17 @@ bool wxPrinter::Setup(wxWindow *parent)
  * Print preview
  */
 
  * Print preview
  */
 

-wxPrintPreview::wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
+wxOS2PrintPreview::wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):

   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 
   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 

-wxPrintPreview::~wxPrintPreview()
+wxOS2PrintPreview::~wxOS2PrintPreview()

 {
 }
 
 {
 }
 

-bool wxPrintPreview::Print(bool interactive)
+bool wxOS2PrintPreview::Print(bool interactive)

 {
     if (!m_printPrintout)
         return FALSE;
 {
     if (!m_printPrintout)
         return FALSE;


@@ -90,7 +90,7 @@ bool wxPrintPreview::Print(bool interactive)
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxPrintPreview::DetermineScaling()
+void wxOS2PrintPreview::DetermineScaling()

 {
     // TODO
 }
 {
     // TODO
 }

diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index 14ba806ec589e42f3dfe3a592ac0b020476d7e46..283fd9cdbf01aa6ed025f887d83558990566a644 100644 (file)
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -107,11 +107,12 @@ void wxRadioBox::AdjustButtons(
     int                             nStartY;
     int                             nMaxWidth;
     int                             nMaxHeight;
     int                             nStartY;
     int                             nMaxWidth;
     int                             nMaxHeight;

+    wxFont                          vFont = GetFont();

 
     wxGetCharSize( m_hWnd
                   ,&nCx1
                   ,&nCy1
 
     wxGetCharSize( m_hWnd
                   ,&nCx1
                   ,&nCy1

-                  ,&GetFont()
+                  ,&vFont

                  );
     vMaxSize   = GetMaxButtonSize();
     nMaxWidth  = vMaxSize.x;
                  );
     vMaxSize   = GetMaxButtonSize();
     nMaxWidth  = vMaxSize.x;


@@ -463,6 +464,7 @@ void wxRadioBox::DoSetSize(
     int                             nTotHeight;
     int                             nStartX;
     int                             nStartY;
     int                             nTotHeight;
     int                             nStartX;
     int                             nStartY;

+    wxFont                          vFont = GetFont();

 
     m_nSizeFlags = nSizeFlags;
     GetPosition( &nCurrentX
 
     m_nSizeFlags = nSizeFlags;
     GetPosition( &nCurrentX


@@ -484,7 +486,7 @@ void wxRadioBox::DoSetSize(
     wxGetCharSize( m_hWnd
                   ,&nCx1
                   ,&nCy1
     wxGetCharSize( m_hWnd
                   ,&nCx1
                   ,&nCy1

-                  ,&GetFont()
+                  ,&vFont

                  );
 
     //
                  );
 
     //


@@ -903,11 +905,12 @@ wxSize wxRadioBox::GetTotalButtonSize(
     int                             nHeight;
     int                             nWidth;
     int                             nWidthLabel;
     int                             nHeight;
     int                             nWidth;
     int                             nWidthLabel;

+    wxFont                          vFont = GetFont();

 
     wxGetCharSize( m_hWnd
                   ,&nCx1
                   ,&nCy1
 
     wxGetCharSize( m_hWnd
                   ,&nCx1
                   ,&nCy1

-                  ,(wxFont*)&GetFont()
+                  ,&vFont

                  );
     nExtraHeight = nCy1;
 
                  );
     nExtraHeight = nCy1;
 

diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index b97747f687fd17fe90e7a8baf9a565cff22a455b..1dec64ffc2a85aad015711f21b94d11606d47b91 100644 (file)
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -66,11 +66,12 @@ void wxSlider::AdjustSubControls(
     int                             nCy;
     int                             nCyf;
     char                            zBuf[300];
     int                             nCy;
     int                             nCyf;
     char                            zBuf[300];

+    wxFont                          vFont = this->GetFont();

 
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy
 
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy

-                  ,&this->GetFont()
+                  ,&vFont

                  );
 
     if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
                  );
 
     if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)


@@ -81,10 +82,10 @@ void wxSlider::AdjustSubControls(
             int                     nMaxLen = 0;
 
             ::WinQueryWindowText((HWND)m_hStaticMin, 300, zBuf);
             int                     nMaxLen = 0;
 
             ::WinQueryWindowText((HWND)m_hStaticMin, 300, zBuf);

-            GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &this->GetFont());
+            GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &vFont);

 
             ::WinQueryWindowText((HWND)m_hStaticMax, 300, zBuf);
 
             ::WinQueryWindowText((HWND)m_hStaticMax, 300, zBuf);

-            GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &this->GetFont());
+            GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &vFont);

 
             if (m_hStaticValue)
             {
 
             if (m_hStaticValue)
             {


@@ -132,10 +133,10 @@ void wxSlider::AdjustSubControls(
             int                     nMaxLen = 0;
 
             ::WinQueryWindowText((HWND)m_hStaticMin, 300, zBuf);
             int                     nMaxLen = 0;
 
             ::WinQueryWindowText((HWND)m_hStaticMin, 300, zBuf);

-            GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &this->GetFont());
+            GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &vFont);

 
             ::WinQueryWindowText((HWND)m_hStaticMax, 300, zBuf);
 
             ::WinQueryWindowText((HWND)m_hStaticMax, 300, zBuf);

-            GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &this->GetFont());
+            GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &vFont);

 
             if (m_hStaticValue)
             {
 
             if (m_hStaticValue)
             {


@@ -485,6 +486,7 @@ void wxSlider::DoSetSize(
     int                             nCurrentX;
     int                             nCurrentY;
     char                            zBuf[300];
     int                             nCurrentX;
     int                             nCurrentY;
     char                            zBuf[300];

+    wxFont                          vFont = this->GetFont();

 
     //
     // Adjust for OS/2's reverse coordinate system
 
     //
     // Adjust for OS/2's reverse coordinate system


@@ -530,7 +532,7 @@ void wxSlider::DoSetSize(
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy

-                  ,&this->GetFont()
+                  ,&vFont

                  );
 
     if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
                  );
 
     if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)


@@ -541,9 +543,9 @@ void wxSlider::DoSetSize(
             int                  nMaxLen = 0;
 
             ::WinQueryWindowText((HWND)m_hStaticMin, 300, zBuf);
             int                  nMaxLen = 0;
 
             ::WinQueryWindowText((HWND)m_hStaticMin, 300, zBuf);

-            GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &this->GetFont());
+            GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &vFont);

             ::WinQueryWindowText((HWND)m_hStaticMax, 300, zBuf);
             ::WinQueryWindowText((HWND)m_hStaticMax, 300, zBuf);

-            GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &this->GetFont());
+            GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &vFont);

 
             if (m_hStaticValue)
             {
 
             if (m_hStaticValue)
             {


@@ -648,9 +650,9 @@ void wxSlider::DoSetSize(
             int                  nMaxLen;
 
             ::WinQueryWindowText((HWND)m_hStaticMin, 300, zBuf);
             int                  nMaxLen;
 
             ::WinQueryWindowText((HWND)m_hStaticMin, 300, zBuf);

-            GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &this->GetFont());
+            GetTextExtent(zBuf, &nMinLen, &nCyf, NULL, NULL, &vFont);

             ::WinQueryWindowText((HWND)m_hStaticMax, 300, zBuf);
             ::WinQueryWindowText((HWND)m_hStaticMax, 300, zBuf);

-            GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &this->GetFont());
+            GetTextExtent(zBuf, &nMaxLen, &nCyf, NULL, NULL, &vFont);

             if (m_hStaticValue)
             {
                 int              nNewWidth = wxMax(nMinLen, nMaxLen);
             if (m_hStaticValue)
             {
                 int              nNewWidth = wxMax(nMinLen, nMaxLen);

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index a30d967d5945fcb6bb5c91d96b6a20075d488403..470c2380e974811690985ddf832d1f39fad443af 100644 (file)
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -96,11 +96,12 @@ wxSize wxStaticBox::DoGetBestSize() const
     int                             nCx;
     int                             nCy;
     int                             wBox;
     int                             nCx;
     int                             nCy;
     int                             wBox;

+    wxFont                          vFont = GetFont();

 
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy
 
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy

-                  ,(wxFont*)&GetFont()
+                  ,&vFont

                  );
     GetTextExtent( wxGetWindowText(m_hWnd)
                   ,&wBox
                  );
     GetTextExtent( wxGetWindowText(m_hWnd)
                   ,&wBox