projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add required padding to DoGetBestSize() for small bitmaps when using themes
[wxWidgets.git]
/
src
/
msw
/
nativdlg.cpp
diff --git
a/src/msw/nativdlg.cpp
b/src/msw/nativdlg.cpp
index fd61bcf8e2536ecf2af64c587ba9f17712cd1436..0f86383b8d4ef0a64c67f352f0750d99ac686eb7 100644
(file)
--- a/
src/msw/nativdlg.cpp
+++ b/
src/msw/nativdlg.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: nativdlg.cpp
+// Name:
src/msw/
nativdlg.cpp
// Purpose: Native dialog loading code (part of wxWindow)
// Author: Julian Smart
// Modified by:
// Purpose: Native dialog loading code (part of wxWindow)
// Author: Julian Smart
// Modified by:
@@
-17,10
+17,6
@@
// headers
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation
-#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"
@@
-34,9
+30,7
@@
#include "wx/wx.h"
#endif
#include "wx/wx.h"
#endif
-#if defined(__WIN95__)
#include "wx/spinbutt.h"
#include "wx/spinbutt.h"
-#endif
#include "wx/msw/private.h"
// ---------------------------------------------------------------------------
#include "wx/msw/private.h"
// ---------------------------------------------------------------------------
@@
-152,20
+146,14
@@
wxWindow* wxWindow::GetWindowChild(wxWindowID id)
wxWindow* win = GetWindowChild1(id);
if ( !win )
{
wxWindow* win = GetWindowChild1(id);
if ( !win )
{
- HWND hWnd = ::GetDlgItem((HWND) GetHWND(), id);
-
- if (hWnd)
+ HWND hwnd = ::GetDlgItem(GetHwnd(), id);
+ if ( hwnd )
{
{
- wxWindow* child = CreateWindowFromHWND(this, (WXHWND) hWnd);
- if (child)
- {
- child->AddChild(this);
- return child;
- }
+ win = CreateWindowFromHWND(this, (WXHWND) hwnd);
}
}
}
}
- return
NULL
;
+ return
win
;
}
// ---------------------------------------------------------------------------
}
// ---------------------------------------------------------------------------
@@
-271,7
+259,7
@@
wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
win = new wxScrollBar;
}
#endif
win = new wxScrollBar;
}
#endif
-#if
defined(__WIN95__) &&
wxUSE_SPINBTN
+#if wxUSE_SPINBTN
else if (str == wxT("MSCTLS_UPDOWN32"))
{
win = new wxSpinButton;
else if (str == wxT("MSCTLS_UPDOWN32"))
{
win = new wxSpinButton;
@@
-340,4
+328,3
@@
void wxWindow::AdoptAttributesFromHWND(void)
if (style & WS_HSCROLL)
m_windowStyle |= wxHSCROLL;
}
if (style & WS_HSCROLL)
m_windowStyle |= wxHSCROLL;
}
-