Small fixes for compiling Cygwin (with --disable-sockets)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-17 12:43:15 +00:00
parent 1f867767ac
commit 7acf6a921e
7 changed files with 11 additions and 6 deletions
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -23,7 +23,7 @@

 #include "wx/msw/wrapwin.h"

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__)
 #include <winsock.h>
 #endif

--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -282,7 +282,7 @@ public:
    virtual bool IsEditable() const = 0;

    // more readable flag testing methods
-    bool IsSingleLine() const { return !(GetWindowStyle() & wxTE_MULTILINE); }
+    bool IsSingleLine() const { return !HasFlag(wxTE_MULTILINE); }
    bool IsMultiLine() const { return !IsSingleLine(); }

    // If the return values from and to are the same, there is no selection.