removed unused wxWindow::m_doubleClickAllowed field

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index f2e843fb3123f10a037c0202398ee7e31993f86e..1879fef243b2c8cf4843531d3ba214eb3be1c264 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -422,7 +422,6 @@ protected:
     bool                  m_useCtl3D:1; // Using CTL3D for this control
     bool                  m_backgroundTransparent:1;
     bool                  m_mouseInWindow:1;
     bool                  m_useCtl3D:1; // Using CTL3D for this control
     bool                  m_backgroundTransparent:1;
     bool                  m_mouseInWindow:1;

-    bool                  m_doubleClickAllowed:1;

     bool                  m_lastKeydownProcessed:1;
 
     // the size of one page for scrolling
     bool                  m_lastKeydownProcessed:1;
 
     // the size of one page for scrolling

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index cf7c4277ac81302bc7927295f17fa2eb48cf5f58..fb4aeded03b366df803a5c73d0cccf57364ec005 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -312,8 +312,6 @@ void wxWindowMSW::Init()
     InitBase();
 
     // MSW specific
     InitBase();
 
     // MSW specific

-    m_doubleClickAllowed = 0;
-

     m_isBeingDeleted = FALSE;
     m_oldWndProc = 0;
     m_useCtl3D = FALSE;
     m_isBeingDeleted = FALSE;
     m_oldWndProc = 0;
     m_useCtl3D = FALSE;


@@ -2951,20 +2949,7 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
 
     // controlId is menu handle for the top level windows, so set it to 0
     // unless we're creating a child window
 
     // controlId is menu handle for the top level windows, so set it to 0
     // unless we're creating a child window

-    int controlId;
-    if ( style & WS_CHILD )
-    {
-        controlId = GetId();
-
-        if ( GetWindowStyleFlag() & wxCLIP_SIBLINGS )
-        {
-            style |= WS_CLIPSIBLINGS;
-        }
-    }
-    else // !child
-    {
-        controlId = 0;
-    }
+    int controlId = style & WS_CHILD ? GetId() : 0;

 
     // for each class "Foo" we have we also have "FooNR" ("no repaint") class
     // which is the same but without CS_[HV]REDRAW class styles so using it
 
     // for each class "Foo" we have we also have "FooNR" ("no repaint") class
     // which is the same but without CS_[HV]REDRAW class styles so using it