Added style parameter to wxPopupWindow ctors so they match the Create method.

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

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index b141a80ff1c9bc933cc4af9101ff80adb24cb527..f50e813f90a2caf87463bae07318944c5e526395 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -1,95 +1,239 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        control.cpp
 // Purpose:     wxControl class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        control.cpp
 // Purpose:     wxControl class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     09/17/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart and Markus Holzem
+// Licence:     wxWindows licence

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

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+#include "wx/event.h"
+#include "wx/app.h"
+#include "wx/dcclient.h"
+#endif
+#include "wx/os2/private.h"

 #include "wx/control.h"
 
 #include "wx/control.h"
 

-#if !USE_SHARED_LIBRARY

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

+    EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif

 
 // Item members
 wxControl::wxControl()
 {
 
 // Item members
 wxControl::wxControl()
 {

-    m_backgroundColour = *wxWHITE;
-    m_foregroundColour = *wxBLACK;
-    m_callback = 0;
-}
-
-wxControl::~wxControl()
+  m_backgroundColour = *wxWHITE;
+  m_foregroundColour = *wxBLACK;
+
+#if WXWIN_COMPATIBILITY
+  m_callback = 0;
+#endif // WXWIN_COMPATIBILITY
+} // 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
+)

 {
 {

-    // If we delete an item, we should initialize the parent panel,
-    // because it could now be invalid.
-    wxWindow *parent = (wxWindow *)GetParent();
-    if (parent)
+    bool                            bRval = wxWindow::Create( pParent
+                                                             ,vId
+                                                             ,rPos
+                                                             ,rSize
+                                                             ,lStyle
+                                                             ,rsName
+                                                            );
+    if (bRval)

     {
     {

-        if (parent->GetDefaultItem() == (wxButton*) this)
-            parent->SetDefaultItem(NULL);
+#if wxUSE_VALIDATORS
+        SetValidator(rValidator);
+#endif

     }
     }

-}
+    return bRval;
+} // end of wxControl::Create

 
 

-void wxControl::SetLabel(const wxString& label)
+wxControl::~wxControl()

 {
 {

-    // TODO
+    m_isBeingDeleted = TRUE;

 }
 
 }
 

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

 {
 {

-    // TODO
-    return wxString("");
-}
+    //
+    // Doesn't do anything at all under OS/2
+    //
+    if (dwExstyle == (WXDWORD)-1)
+    {
+        dwExstyle = GetExStyle(dwStyle);
+    }

 
 

-void wxControl::ProcessCommand (wxCommandEvent & event)
-{
-  // Tries:
-  // 1) A callback function (to become obsolete)
-  // 2) OnCommand, starting at this window and working up parent hierarchy
-  // 3) OnCommand then calls ProcessEvent to search the event tables.
-  if (m_callback)
+    if ( !m_hWnd )

     {
     {

-      (void) (*(m_callback)) (*this, event);
+#ifdef __WXDEBUG__
+        wxLogError(wxT("Failed to create a control of class '%s'"), zClassname);
+#endif // DEBUG
+
+        return FALSE;

     }
     }

-    else
+    dwStyle |= WS_VISIBLE;
+    m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(GetParent()) // Parent window handle
+                                       ,(PSZ)zClassname              // Window class
+                                       ,(PSZ)rsLabel.c_str()         // Initial Text
+                                       ,(ULONG)dwStyle               // Style flags
+                                       ,(LONG)rPos.x                 // X pos of origin
+                                       ,(LONG)rPos.y                 // Y pos of origin
+                                       ,(LONG)rSize.x                // control width
+                                       ,(LONG)rSize.y                // control height
+                                       ,(HWND)GetHwndOf(GetParent()) // owner window handle (same as parent
+                                       ,HWND_TOP                     // initial z position
+                                       ,(ULONG)GetId()               // Window identifier
+                                       ,NULL                         // no control data
+                                       ,NULL                         // no Presentation parameters
+                                      );
+
+    //
+    // Subclass again for purposes of dialog editing mode
+    //
+    SubclassWin(m_hWnd);
+
+    //
+    // Controls use the same font and colours as their parent dialog by default
+    //
+    InheritAttributes();
+    return TRUE;
+} // end of wxControl::OS2CreateControl
+
+wxSize wxControl::DoGetBestSize() const
+{
+    return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
+} // end of wxControl::DoGetBestSize
+
+bool wxControl::ProcessCommand(wxCommandEvent& event)
+{
+#if WXWIN_COMPATIBILITY
+    if ( m_callback )

     {
     {

-      GetEventHandler()->OnCommand(*this, event);
+        (void)(*m_callback)(this, event);
+
+        return TRUE;

     }
     }

+    else
+#endif // WXWIN_COMPATIBILITY
+
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-void wxControl::Centre (int direction)
+WXHBRUSH wxControl::OnCtlColor(
+  WXHDC                             hWxDC
+, WXHWND                            hWnd
+, WXUINT                            uCtlColor
+, WXUINT                            uMessage
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)
+{
+    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);
+    else
+        ::GpiSetBackMix(hPS, BM_OVERPAINT);
+
+    ::GpiSetBackColor(hPS, vColBack.GetPixel());
+    ::GpiSetColor(hPS, vColFore.GetPixel());
+
+    wxBrush*                        pBrush = wxTheBrushList->FindOrCreateBrush( vColBack
+                                                                               ,wxSOLID
+                                                                              );
+    return (WXHBRUSH)pBrush->GetResourceHandle();
+} // end of wxControl::OnCtlColor
+
+void wxControl::OnEraseBackground(
+  wxEraseEvent&                     rEvent
+)

 {
 {

-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
+    RECTL                           vRect;
+    HPS                             hPS = rEvent.GetDC()->GetHPS();
+    SIZEL                           vSize = {0,0};
+
+    ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT);
+    ::WinQueryWindowRect((HWND)GetHwnd(), &vRect);
+    ::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
+} // end of wxControl::OnEraseBackground
+
+WXDWORD wxControl::GetExStyle(
+  WXDWORD&                          rStyle
+) const
+{
+    //
+    // Meaningless under OS/2, just return what was sent
+    //
+    WXDWORD                         exStyle = rStyle;
+
+    return exStyle;
+} // end of wxControl::GetExStyle
+
+// ---------------------------------------------------------------------------
+// global functions
+// ---------------------------------------------------------------------------
+
+// Call this repeatedly for several wnds to find the overall size
+// of the widget.
+// Call it initially with -1 for all values in rect.
+// Keep calling for other widgets, and rect will be modified
+// to calculate largest bounding rectangle.
+void wxFindMaxSize(
+  WXHWND                            hWnd
+, RECT*                             pRect
+)
+{
+    int                             nLeft = pRect->xLeft;
+    int                             nRight = pRect->xRight;
+    int                             nTop = pRect->yTop;
+    int                             nBottom = pRect->yBottom;

 
 

-  wxWindow *parent = (wxWindow *) GetParent ();
-  if (!parent)
-    return;
+    ::WinQueryWindowRect((HWND)hWnd, pRect);

 
 

-  parent->GetClientSize (&panel_width, &panel_height);
-  GetSize (&width, &height);
-  GetPosition (&x, &y);
+    if (nLeft < 0)
+        return;

 
 

-  new_x = x;
-  new_y = y;
+    if (nLeft < pRect->xLeft)
+        pRect->xLeft = nLeft;

 
 

-  if (direction & wxHORIZONTAL)
-    new_x = (int) ((panel_width - width) / 2);
+    if (nRight > pRect->xRight)
+        pRect->xRight = nRight;

 
 

-  if (direction & wxVERTICAL)
-    new_y = (int) ((panel_height - height) / 2);
+    if (nTop < pRect->yTop)
+        pRect->yTop = nTop;
+
+    if (nBottom > pRect->yBottom)
+        pRect->yBottom = nBottom;
+} // end of wxFindMaxSize

 
 

-  SetSize (new_x, new_y, width, height);
-}