From: David Webster Date: Sun, 17 Oct 1999 17:23:27 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/04701dd94f691292563a1f0eb19933819b1c5fe9 *** empty log message *** git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h index 84e20dc840..db8ddd129f 100644 --- a/include/wx/spinctrl.h +++ b/include/wx/spinctrl.h @@ -52,6 +52,8 @@ protected: #if defined(__WXMSW__) && defined(__WIN32__) #include "wx/msw/spinctrl.h" +#elif defined(__WXPM__) + #include "wx/os2/spinctrl.h" #elif defined(__WXGTK__) #include "wx/gtk/spinctrl.h" #else // Win16 || !Win diff --git a/src/os2/data.cpp b/src/os2/data.cpp index ae00740978..d899b9771a 100644 --- a/src/os2/data.cpp +++ b/src/os2/data.cpp @@ -29,12 +29,6 @@ wxWindowList wxTopLevelWindows; // List of windows pending deletion wxList WXDLLEXPORT wxPendingDelete; -// List of events pending processing -#if wxUSE_THREADS -wxList *wxPendingEvents = NULL; -wxCriticalSection *wxPendingEventsLocker = NULL; -#endif - // Current cursor, in order to hang on to // cursor handle when setting the cursor globally wxCursor *g_globalCursor = NULL; diff --git a/src/os2/region.cpp b/src/os2/region.cpp index cb637f96eb..58495d9a9e 100644 --- a/src/os2/region.cpp +++ b/src/os2/region.cpp @@ -44,8 +44,11 @@ public: // TODO } + + HRGN m_region; }; +#define M_REGION (((wxRegionRefData*)m_refData)->m_region) //----------------------------------------------------------------------------- // wxRegion @@ -224,11 +227,12 @@ bool wxRegion::Empty() const // Does the region contain the point (x,y)? wxRegionContain wxRegion::Contains(long x, long y) const { + bool bOK = FALSE; // temporary if (!m_refData) return wxOutRegion; // TODO. Return wxInRegion if within region. - if (0) + if (bOK) return wxInRegion; return wxOutRegion; } @@ -236,11 +240,12 @@ wxRegionContain wxRegion::Contains(long x, long y) const // Does the region contain the point pt? wxRegionContain wxRegion::Contains(const wxPoint& pt) const { + bool bOK = FALSE; // temporary if (!m_refData) return wxOutRegion; // TODO. Return wxInRegion if within region. - if (0) + if (bOK) return wxInRegion; else return wxOutRegion; @@ -249,11 +254,12 @@ wxRegionContain wxRegion::Contains(const wxPoint& pt) const // Does the region contain the rectangle (x, y, w, h)? wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const { + bool bOK = FALSE; // temporary if (!m_refData) return wxOutRegion; // TODO. Return wxInRegion if within region. - if (0) + if (bOK) return wxInRegion; else return wxOutRegion; diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp index 8c70f74b60..00225e72ed 100644 --- a/src/os2/scrolbar.cpp +++ b/src/os2/scrolbar.cpp @@ -43,7 +43,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, parent->AddChild(this); SetName(name); SetValidator(validator); - + SetBackgroundColour(parent->GetBackgroundColour()) ; SetForegroundColour(parent->GetForegroundColour()) ; m_windowStyle = style; @@ -83,6 +83,8 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, m_hWnd = 0; // TODO: (WXHWND)scroll_bar; + HWND scroll_bar = 0; // temporary + // Subclass again for purposes of dialog editing mode SubclassWin((WXHWND) scroll_bar); diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index 9dee621c51..130472e6ad 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -27,6 +27,7 @@ #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) +#endif // Slider wxSlider::wxSlider() @@ -140,6 +141,7 @@ bool wxSlider::OS2OnScroll(int WXUNUSED(orientation), WXWORD wParam, return TRUE; } */ + int newPos = 0; //temporary SetValue(newPos); wxScrollEvent event(scrollEvent, m_windowId); diff --git a/src/os2/spinbutt.cpp b/src/os2/spinbutt.cpp index 42fb9e768d..554c1a692c 100644 --- a/src/os2/spinbutt.cpp +++ b/src/os2/spinbutt.cpp @@ -51,9 +51,6 @@ bool wxSpinButton::Create( SetParent(parent); - m_min = 0; - m_max = 100; - m_windowId = (id == -1) ? NewControlId() : id; // TODO create spin button @@ -150,7 +147,7 @@ bool wxSpinButton::OS2OnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) return FALSE; } -bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id) +bool wxSpinButton::OS2Command(WXUINT cmd, WXWORD id) { // No command messages return FALSE; diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index 412e6511a3..8a6baa82ee 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -41,10 +41,14 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - m_messageBitmap = bitmap; + Init(); + SetName(name); if (parent) parent->AddChild(this); + m_backgroundColour = parent->GetBackgroundColour() ; + m_foregroundColour = parent->GetForegroundColour() ; + if ( id == -1 ) m_windowId = (int)NewControlId(); else @@ -52,7 +56,27 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, m_windowStyle = style; + int x = pos.x; + int y = pos.y; + int width = size.x; + int height = size.y; + + m_windowStyle = style; + + m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon)); + // TODO: create static bitmap control + wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") ); + + SetBitmap(bitmap); + + // Subclass again for purposes of dialog editing mode + SubclassWin(m_hWnd); + + SetFont(GetParent()->GetFont()); + + SetSize(x, y, width, height); + return FALSE; } diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp index c88b00c999..97f0152e57 100644 --- a/src/os2/statbox.cpp +++ b/src/os2/statbox.cpp @@ -34,7 +34,7 @@ END_EVENT_TABLE() /* * Group box */ - + bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, @@ -178,6 +178,8 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event) MRESULT wxStaticBox::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { + // TODO: +/* if ( nMsg == WM_NCHITTEST) { int xPos = LOWORD(lParam); // horizontal position of cursor @@ -190,6 +192,7 @@ MRESULT wxStaticBox::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLP if (yPos < 10) return (long)HTCLIENT; } +*/ return wxControl::OS2WindowProc(hwnd, nMsg, wParam, lParam); }