Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-08-04 04:20:17 +00:00
parent 65fd5cb012
commit de44a9f06d
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/os2/window.h
View File

@@ -216,6 +216,7 @@ public:
// on a listbox) // on a listbox)
virtual void OnDefaultAction(wxControl *initiatingItem); virtual void OnDefaultAction(wxControl *initiatingItem);
// EventHandlers
void OnEraseBackground(wxEraseEvent& event); void OnEraseBackground(wxEraseEvent& event);
void OnChar(wxKeyEvent& event); void OnChar(wxKeyEvent& event);
void OnKeyDown(wxKeyEvent& event); void OnKeyDown(wxKeyEvent& event);
@@ -283,8 +284,10 @@ public:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
private: private:
void Init(); void Init();
void PMDetachWindowMenu(); void PMDetachWindowMenu();
WXHWND GetHwnd() const { return m_hWnd; }
void SetHwnd(WXHWND hWnd) { m_hWnd = hWnd; }
}; };
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////

1
src/os2/makefile.va
View File

@@ -267,6 +267,7 @@ pch1: dirs $(DUMMYOBJ)
### Static library ### Static library
$(WXDIR)\lib\wx.lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS) $(WXDIR)\lib\wx.lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
touch $(LIBTARGET)
del $(LIBTARGET) del $(LIBTARGET)
ilib $(LINKFLAGS) $@ @<< ilib $(LINKFLAGS) $@ @<<
$** $**

29
src/os2/window.cpp
View File

@@ -214,7 +214,7 @@ void wxWindow::ReleaseMouse()
// TODO: // TODO:
} }
void wxWindow::Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
{ {
// TODO: // TODO:
} }
@@ -245,9 +245,9 @@ int wxWindow::GetCharWidth() const
void wxWindow::GetTextExtent( const wxString& string void wxWindow::GetTextExtent( const wxString& string
,int* x ,int* x
,int* y ,int* y
,int* descent = NULL ,int* descent
,int* externalLeading = NULL ,int* externalLeading
,const wxFont* theFont = NULL ,const wxFont* theFont
) const ) const
{ {
// TODO: // TODO:
@@ -257,7 +257,7 @@ void wxWindow::SetScrollbar( int orient
,int pos ,int pos
,int thumbVisible ,int thumbVisible
,int range ,int range
,bool refresh = TRUE ,bool refresh
) )
{ {
// TODO: // TODO:
@@ -265,7 +265,7 @@ void wxWindow::SetScrollbar( int orient
void wxWindow::SetScrollPos( int orient void wxWindow::SetScrollPos( int orient
,int pos ,int pos
,bool refresh = TRUE ,bool refresh
) )
{ {
// TODO: // TODO:
@@ -291,7 +291,7 @@ int wxWindow::GetScrollThumb(int orient) const
void wxWindow::ScrollWindow( int dx void wxWindow::ScrollWindow( int dx
,int dy ,int dy
,const wxRect* rect = NULL ,const wxRect* rect
) )
{ {
// TODO: // TODO:
@@ -331,7 +331,7 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
void wxWindow::DoSetSize(int x, int y, void wxWindow::DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO) int sizeFlags)
{ {
// TODO: // TODO:
} }
@@ -378,8 +378,9 @@ bool wxWindow::Validate()
wxWindow* wxWindow::FindFocus() wxWindow* wxWindow::FindFocus()
{ {
wxWindow* window = NULL;
// TODO: // TODO:
return(this); return(window);
} }
void wxWindow::DragAcceptFiles(bool accept) void wxWindow::DragAcceptFiles(bool accept)
@@ -491,7 +492,7 @@ void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
wxObject* wxWindow::GetChild(int number) const wxObject* wxWindow::GetChild(int number) const
{ {
// TODO: // TODO:
return(this); return((wxObject*)this);
} }
void wxWindow::PMDetachWindowMenu() void wxWindow::PMDetachWindowMenu()
@@ -500,12 +501,12 @@ void wxWindow::PMDetachWindowMenu()
{ {
HMENU hMenu = (HMENU)m_hMenu; HMENU hMenu = (HMENU)m_hMenu;
int N = ::GetMenuItemCount(hMenu); int N = (int)WinSendMsg(hMenu, MM_QUERYITEMCOUNT, 0, 0);
int i; int i;
for (i = 0; i < N; i++) for (i = 0; i < N; i++)
{ {
wxChar buf[100]; wxChar buf[100];
int chars = GetMenuString(hMenu, i, buf, 100, MF_BYPOSITION); int chars = (int)WinSendMsg(hMenu, MM_QUERYITEMTEXT, MPFROM2SHORT(i, N), buf);
if ( !chars ) if ( !chars )
{ {
wxLogLastError(_T("GetMenuString")); wxLogLastError(_T("GetMenuString"));
@@ -515,13 +516,13 @@ void wxWindow::PMDetachWindowMenu()
if ( wxStrcmp(buf, _T("&Window")) == 0 ) if ( wxStrcmp(buf, _T("&Window")) == 0 )
{ {
RemoveMenu(hMenu, i, MF_BYPOSITION); WinSendMsg(hMenu, MM_DELETEITEM, MPFROM2SHORT(i, TRUE), 0);
break; break;
} }
} }
} }
} }
void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win) void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win)
{ {
// adding NULL hWnd is (first) surely a result of an error and // adding NULL hWnd is (first) surely a result of an error and