X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38374d0d7aa865e9bbe8ee61b75b94ffcdfb220..0fe536e3f6784c350fd8bf3793d8300499bf4ff4:/src/os2/window.cpp diff --git a/src/os2/window.cpp b/src/os2/window.cpp index ebb2c611d2..088db7e071 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -109,9 +109,7 @@ wxWindow *wxFindWinFromHandle(WXHWND hWnd); // event tables // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) -#endif BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) @@ -623,7 +621,7 @@ WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders) WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D) const { - DWORD exStyle; // remove after implementation doe + DWORD exStyle = 0L; // remove after implementation doe /* TODO: this ought to be fun * // If matches certain criteria, then assume no 3D effects @@ -814,12 +812,6 @@ void wxWindow::DoSetSize(int x, int y, // TODO: } -// for a generic window there is no natural best size - just use the current one -wxSize wxWindow::DoGetBestSize() -{ - return GetSize(); -} - void wxWindow::DoSetClientSize(int width, int height) { // TODO: @@ -983,7 +975,7 @@ void wxWindow::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam, wxWindow *wxWndHook = NULL; // Main window proc -MRESULT wxWndProc(HWND hWnd, UINT message, MPARAM wParam, MPARAM lParam) +MRESULT wxWndProc(HWND hWnd, ULONG message, MPARAM wParam, MPARAM lParam) { // trace all messages - useful for the debugging #ifdef __WXDEBUG__