AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removing unused flags

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2003-04-30 20:17:13 +00:00
parent dd49c69170
commit 4241baae44
3 changed files with 3 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/mac/window.h
View File

@ -165,7 +165,6 @@ public:
// void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
virtual WXWidget GetHandle() const { return (WXWidget) NULL ; }
bool GetUseCtl3D() const { return m_useCtl3D; }
bool GetTransparentBackground() const { return m_backgroundTransparent; }
void SetTransparent(bool t = TRUE) { m_backgroundTransparent = t; }
@ -256,8 +255,6 @@ public:
static wxWindowMac* s_lastMouseWindow ;
private:
protected:
// RgnHandle m_macUpdateRgn ;
// bool m_macEraseOnRedraw ;
wxBrush m_macBackgroundBrush ;
wxRegion m_macVisibleRegion ;
int m_x ;
@ -272,18 +269,7 @@ protected:
void MacCreateScrollBars( long style ) ;
void MacRepositionScrollBars() ;
// additional (MSW specific) flags
bool m_useCtl3D:1; // Using CTL3D for this control
bool m_backgroundTransparent:1;
bool m_mouseInWindow:1;
bool m_doubleClickAllowed:1;
bool m_winCaptured:1;
// the size of one page for scrolling
int m_xThumbSize;
int m_yThumbSize;
// WXHMENU m_hMenu; // Menu, if any
bool m_backgroundTransparent ;
// implement the base class pure virtuals
virtual void DoClientToScreen( int *x, int *y ) const;

46
src/mac/carbon/window.cpp
View File

@ -104,17 +104,6 @@ void wxWindowMac::Init()
// generic
InitBase();
// MSW specific
m_doubleClickAllowed = 0;
m_winCaptured = FALSE;
m_isBeingDeleted = FALSE;
m_useCtl3D = FALSE;
m_mouseInWindow = FALSE;
m_xThumbSize = 0;
m_yThumbSize = 0;
m_backgroundTransparent = FALSE;
// as all windows are created with WS_VISIBLE style...
@ -150,8 +139,6 @@ wxWindowMac::~wxWindowMac()
}
}
m_isBeingDeleted = TRUE;
#ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
@ -800,25 +787,9 @@ bool wxWindowMac::Show(bool show)
if ( !wxWindowBase::Show(show) )
return FALSE;
/*
WindowRef window = (WindowRef) MacGetRootWindow() ;
wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win == NULL && win->m_isBeingDeleted )
return FALSE ;
*/
MacSuperShown( show ) ;
Refresh() ;
/*
if ( !show )
{
if ( win && !win->m_isBeingDeleted )
Refresh() ;
}
else
{
Refresh() ;
}
*/
return TRUE;
}
@ -1397,21 +1368,6 @@ void wxWindowMac::SetupColours()
void wxWindowMac::OnIdle(wxIdleEvent& event)
{
/*
// Check if we need to send a LEAVE event
if (m_mouseInWindow)
{
POINT pt;
::GetCursorPos(&pt);
if (::WindowFromPoint(pt) != (HWND) GetHWND())
{
// Generate a LEAVE event
m_mouseInWindow = FALSE;
MSWOnMouseLeave(pt.x, pt.y, 0);
}
}
*/
// This calls the UI-update mechanism (querying windows for
// menu/toolbar/control state information)
UpdateWindowUI();

46
src/mac/window.cpp
View File

@ -104,17 +104,6 @@ void wxWindowMac::Init()
// generic
InitBase();
// MSW specific
m_doubleClickAllowed = 0;
m_winCaptured = FALSE;
m_isBeingDeleted = FALSE;
m_useCtl3D = FALSE;
m_mouseInWindow = FALSE;
m_xThumbSize = 0;
m_yThumbSize = 0;
m_backgroundTransparent = FALSE;
// as all windows are created with WS_VISIBLE style...
@ -150,8 +139,6 @@ wxWindowMac::~wxWindowMac()
}
}
m_isBeingDeleted = TRUE;
#ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
@ -800,25 +787,9 @@ bool wxWindowMac::Show(bool show)
if ( !wxWindowBase::Show(show) )
return FALSE;
/*
WindowRef window = (WindowRef) MacGetRootWindow() ;
wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win == NULL && win->m_isBeingDeleted )
return FALSE ;
*/
MacSuperShown( show ) ;
Refresh() ;
/*
if ( !show )
{
if ( win && !win->m_isBeingDeleted )
Refresh() ;
}
else
{
Refresh() ;
}
*/
return TRUE;
}
@ -1397,21 +1368,6 @@ void wxWindowMac::SetupColours()
void wxWindowMac::OnIdle(wxIdleEvent& event)
{
/*
// Check if we need to send a LEAVE event
if (m_mouseInWindow)
{
POINT pt;
::GetCursorPos(&pt);
if (::WindowFromPoint(pt) != (HWND) GetHWND())
{
// Generate a LEAVE event
m_mouseInWindow = FALSE;
MSWOnMouseLeave(pt.x, pt.y, 0);
}
}
*/
// This calls the UI-update mechanism (querying windows for
// menu/toolbar/control state information)
UpdateWindowUI();