VC6 doesn't like 'return callToVoidFunc();' statements

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

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index f1168950f8034770a51f78a3d9c907d85d0faa5c..63650453c83fcb8ac3223a65a0bbb786199b900a 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -1,28 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxControl class
 // Author:      David Webster
 // Modified by:
 // Created:     09/17/99
 // RCS-ID:      $Id$
 // Purpose:     wxControl class
 // Author:      David Webster
 // Modified by:
 // Created:     09/17/99
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "control.h"
-#endif
-

 // 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/control.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/dcclient.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/scrolwin.h"
+    #include "wx/log.h"

 #endif
 #endif

+

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

-#include "wx/control.h"

 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 


@@ -33,23 +33,15 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
 // Item members
 wxControl::wxControl()
 {

-
-#if WXWIN_COMPATIBILITY
-  m_callback = 0;
-#endif // WXWIN_COMPATIBILITY

 } // end of wxControl::wxControl
 
 } // end of wxControl::wxControl
 

-bool wxControl::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-#if wxUSE_VALIDATORS
-, const wxValidator&                rValidator
-#endif
-, const wxString&                   rsName
-)
+bool wxControl::Create( wxWindow*           pParent,
+                        wxWindowID          vId,
+                        const wxPoint&      rPos,
+                        const wxSize&       rSize,
+                        long                lStyle,
+                        const wxValidator&  rValidator,
+                        const wxString&     rsName )

 {
     bool                            bRval = wxWindow::Create( pParent
                                                              ,vId
 {
     bool                            bRval = wxWindow::Create( pParent
                                                              ,vId


@@ -69,86 +61,82 @@ bool wxControl::Create(
 
 wxControl::~wxControl()
 {
 
 wxControl::~wxControl()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 }
 
 }
 

-bool wxControl::OS2CreateControl(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-#if wxUSE_VALIDATORS
-, const wxValidator&                rValidator
-#endif
-, const wxString&                   rsName
-)
+bool wxControl::OS2CreateControl( const wxChar* zClassname,
+                                  const wxString& rsLabel,
+                                  const wxPoint& rPos,
+                                  const wxSize& rSize,
+                                  long lStyle )

 {
 {

-    //
-    // Even if it's possible to create controls without parents in some port,
-    // it should surely be discouraged because it doesn't work at all under
-    // Windows
-    //
-    if (!CreateBase( pParent
-                    ,vId
-                    ,rPos
-                    ,rSize
-                    ,lStyle
-#if wxUSE_VALIDATORS
-                    ,rValidator
-#endif
-                    ,rsName
-                   ))
-        return FALSE;
-    pParent->AddChild(this);
-    return TRUE;
+    WXDWORD dwExstyle;
+    WXDWORD dwStyle = OS2GetStyle( lStyle, &dwExstyle );
+
+    return OS2CreateControl( zClassname
+                            ,dwStyle
+                            ,rPos
+                            ,rSize
+                            ,rsLabel
+                            ,dwExstyle
+                           );

 } // end of wxControl::OS2CreateControl
 
 } // end of wxControl::OS2CreateControl
 

-bool wxControl::OS2CreateControl(
-  const wxChar*                     zClassname
-, WXDWORD                           dwStyle
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, const wxString&                   rsLabel
-, WXDWORD                           dwExstyle
-)
+bool wxControl::OS2CreateControl( const wxChar*   zClassname,
+                                  WXDWORD         dwStyle,
+                                  const wxPoint&  rPos,
+                                  const wxSize&   rSize,
+                                  const wxString& rsLabel,
+                                  WXDWORD         dwExstyle )

 {
 {

-    int                          nX = rPos.x == -1 ? 0 : rPos.x;
-    int                          nY = rPos.y == -1 ? 0 : rPos.y;
-    int                          nW = rSize.x == -1 ? 0 : rSize.x;
-    int                          nH = rSize.y == -1 ? 0 : rSize.y;

     //
     // Doesn't do anything at all under OS/2
     //
     if (dwExstyle == (WXDWORD)-1)
     {
     //
     // Doesn't do anything at all under OS/2
     //
     if (dwExstyle == (WXDWORD)-1)
     {

-        dwExstyle = GetExStyle(dwStyle);
+        dwExstyle = 0;
+        (void) OS2GetStyle(GetWindowStyle(), &dwExstyle);

     }
     }

+    //
+    // All controls should have these styles (wxWidgets creates all controls
+    // visible by default)
+    //
+    if (m_isShown )
+        dwStyle |= WS_VISIBLE;

 
 

-    wxWindow*                       pParent = GetParent();
-    PSZ                             zClass;
+    wxWindow* pParent = GetParent();
+    PSZ zClass = "";

 
     if (!pParent)
 
     if (!pParent)

-        return FALSE;
+        return false;

 
 

-    if ((strcmp(zClassname, "COMBOBOX")) == 0)
+    if ((wxStrcmp(zClassname, _T("COMBOBOX"))) == 0)

         zClass = WC_COMBOBOX;
         zClass = WC_COMBOBOX;

-    else if ((strcmp(zClassname, "STATIC")) == 0)
+    else if ((wxStrcmp(zClassname, _T("STATIC"))) == 0)

         zClass = WC_STATIC;
         zClass = WC_STATIC;

-    dwStyle |= WS_VISIBLE;
+    else if ((wxStrcmp(zClassname, _T("BUTTON"))) == 0)
+        zClass = WC_BUTTON;
+    else if ((wxStrcmp(zClassname, _T("NOTEBOOK"))) == 0)
+        zClass = WC_NOTEBOOK;
+    else if ((wxStrcmp(zClassname, _T("CONTAINER"))) == 0)
+        zClass = WC_CONTAINER;
+    if ((zClass == WC_STATIC) || (zClass == WC_BUTTON))
+        dwStyle |= DT_MNEMONIC;
+
+    m_dwStyle = dwStyle;
+    m_label = rsLabel;
+    wxString label;
+    if (dwStyle & DT_MNEMONIC)
+        label = ::wxPMTextToLabel(m_label);
+    else
+        label = m_label;

 
 

-    //
-    // If the parent is a scrolled window the controls must
-    // have this style or they will overlap the scrollbars
-    //
-    if (pParent)
-        if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
-            pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
-            dwStyle |= WS_CLIPSIBLINGS;
+    // clipping siblings does not yet work
+    dwStyle &= ~WS_CLIPSIBLINGS;

 
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
 
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle

-                                       ,(PSZ)zClass              // Window class
-                                       ,(PSZ)rsLabel.c_str()     // Initial Text
+                                       ,zClass              // Window class
+                                       ,label.c_str()       // Initial Text

                                        ,(ULONG)dwStyle           // Style flags
                                        ,(LONG)0                  // X pos of origin
                                        ,(LONG)0                  // Y pos of origin
                                        ,(ULONG)dwStyle           // Style flags
                                        ,(LONG)0                  // X pos of origin
                                        ,(LONG)0                  // Y pos of origin


@@ -167,7 +155,7 @@ bool wxControl::OS2CreateControl(
         wxLogError(wxT("Failed to create a control of class '%s'"), zClassname);
 #endif // DEBUG
 
         wxLogError(wxT("Failed to create a control of class '%s'"), zClassname);
 #endif // DEBUG
 

-        return FALSE;
+        return false;

     }
     //
     // Subclass again for purposes of dialog editing mode
     }
     //
     // Subclass again for purposes of dialog editing mode


@@ -175,12 +163,18 @@ bool wxControl::OS2CreateControl(
     SubclassWin(m_hWnd);
 
     //
     SubclassWin(m_hWnd);
 
     //

-    // Controls use the same font and colours as their parent dialog by default
+    // Controls use the same colours as their parent dialog by default

     //
     InheritAttributes();
     //
     InheritAttributes();

-    if (nW == 0 || nH == 0)
-        SetBestSize(rSize);
-    return TRUE;
+    //
+    // All OS/2 ctrls use the small font
+    //
+    SetFont(*wxSMALL_FONT);
+
+    SetXComp(0);
+    SetYComp(0);
+    SetSize( rPos.x, rPos.y, rSize.x, rSize.y );
+    return true;

 } // end of wxControl::OS2CreateControl
 
 wxSize wxControl::DoGetBestSize() const
 } // end of wxControl::OS2CreateControl
 
 wxSize wxControl::DoGetBestSize() const


@@ -190,31 +184,19 @@ wxSize wxControl::DoGetBestSize() const
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {

-#if WXWIN_COMPATIBILITY
-    if ( m_callback )
-    {
-        (void)(*m_callback)(this, event);
-
-        return TRUE;
-    }
-    else
-#endif // WXWIN_COMPATIBILITY
-

     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }
 

-WXHBRUSH wxControl::OnCtlColor(
-  WXHDC                             hWxDC
-, WXHWND                            hWnd
-, WXUINT                            uCtlColor
-, WXUINT                            uMessage
-, WXWPARAM                          wParam
-, WXLPARAM                          lParam
-)
+WXHBRUSH wxControl::OnCtlColor(WXHDC    hWxDC,
+                               WXHWND   WXUNUSED(hWnd),
+                               WXUINT   WXUNUSED(uCtlColor),
+                               WXUINT   WXUNUSED(uMessage),
+                               WXWPARAM WXUNUSED(wParam),
+                               WXLPARAM WXUNUSED(lParam))

 {
 {

-    HPS                             hPS = (HPS)hWxDC; // pass in a PS handle in OS/2
-    wxColour                        vColFore = GetForegroundColour();
-    wxColour                        vColBack = GetBackgroundColour();
+    HPS      hPS = (HPS)hWxDC; // pass in a PS handle in OS/2
+    wxColour vColFore = GetForegroundColour();
+    wxColour vColBack = GetBackgroundColour();

 
     if (GetParent()->GetTransparentBackground())
         ::GpiSetBackMix(hPS, BM_LEAVEALONE);
 
     if (GetParent()->GetTransparentBackground())
         ::GpiSetBackMix(hPS, BM_LEAVEALONE);


@@ -224,15 +206,13 @@ WXHBRUSH wxControl::OnCtlColor(
     ::GpiSetBackColor(hPS, vColBack.GetPixel());
     ::GpiSetColor(hPS, vColFore.GetPixel());
 
     ::GpiSetBackColor(hPS, vColBack.GetPixel());
     ::GpiSetColor(hPS, vColFore.GetPixel());
 

-    wxBrush*                        pBrush = wxTheBrushList->FindOrCreateBrush( vColBack
-                                                                               ,wxSOLID
-                                                                              );
+    wxBrush* pBrush = wxTheBrushList->FindOrCreateBrush( vColBack
+                                                         ,wxSOLID
+                                                       );

     return (WXHBRUSH)pBrush->GetResourceHandle();
 } // end of wxControl::OnCtlColor
 
     return (WXHBRUSH)pBrush->GetResourceHandle();
 } // end of wxControl::OnCtlColor
 

-void wxControl::OnEraseBackground(
-  wxEraseEvent&                     rEvent
-)
+void wxControl::OnEraseBackground( wxEraseEvent& rEvent )

 {
     RECTL                           vRect;
     HPS                             hPS = rEvent.GetDC()->GetHPS();
 {
     RECTL                           vRect;
     HPS                             hPS = rEvent.GetDC()->GetHPS();


@@ -243,17 +223,30 @@ void wxControl::OnEraseBackground(
     ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
 } // end of wxControl::OnEraseBackground
 
     ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
 } // end of wxControl::OnEraseBackground
 

-WXDWORD wxControl::GetExStyle(
-  WXDWORD&                          rStyle
-) const
+WXDWORD wxControl::OS2GetStyle( long lStyle, WXDWORD* pdwExstyle ) const

 {
 {

-    //
-    // Meaningless under OS/2, just return what was sent
-    //
-    WXDWORD                         exStyle = rStyle;
+    long dwStyle = wxWindow::OS2GetStyle( lStyle, pdwExstyle );
+
+    if (AcceptsFocusFromKeyboard())
+    {
+        dwStyle |= WS_TABSTOP;
+    }
+    return dwStyle;
+} // end of wxControl::OS2GetStyle

 
 

-    return exStyle;
-} // end of wxControl::GetExStyle
+void wxControl::SetLabel( const wxString& rsLabel )
+{
+    if(rsLabel != m_label)
+    {
+        m_label = rsLabel;
+        wxString label;
+        if (m_dwStyle & DT_MNEMONIC)
+            label = ::wxPMTextToLabel(m_label);
+        else
+            label = m_label;
+        ::WinSetWindowText(GetHwnd(), label.c_str());
+    }
+} // end of wxControl::SetLabel

 
 // ---------------------------------------------------------------------------
 // global functions
 
 // ---------------------------------------------------------------------------
 // global functions


@@ -285,11 +278,9 @@ void wxFindMaxSize(
     if (nRight > pRect->xRight)
         pRect->xRight = nRight;
 
     if (nRight > pRect->xRight)
         pRect->xRight = nRight;
 

-    if (nTop < pRect->yTop)
+    if (nTop > pRect->yTop)

         pRect->yTop = nTop;
 
         pRect->yTop = nTop;
 

-    if (nBottom > pRect->yBottom)
+    if (nBottom < pRect->yBottom)

         pRect->yBottom = nBottom;
 } // end of wxFindMaxSize
         pRect->yBottom = nBottom;
 } // end of wxFindMaxSize

-
-