fixed Xcode 1.2 warnings; code cleanup

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index d0dca74f7918842342244c98625001be7f226846..48b20868d0b4cd20eb265f3e242c6b395c55396a 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -128,7 +128,11 @@
 wxMenu *wxCurrentPopupMenu = NULL;
 #endif // wxUSE_MENUS_NATIVE
 
 wxMenu *wxCurrentPopupMenu = NULL;
 #endif // wxUSE_MENUS_NATIVE
 

+#ifdef __WXWINCE__
+extern       wxChar *wxCanvasClassName;
+#else

 extern const wxChar *wxCanvasClassName;
 extern const wxChar *wxCanvasClassName;

+#endif

 
 // true if we had already created the std colour map, used by
 // wxGetStdColourMap() and wxWindow::OnSysColourChanged()           (FIXME-MT)
 
 // true if we had already created the std colour map, used by
 // wxGetStdColourMap() and wxWindow::OnSysColourChanged()           (FIXME-MT)


@@ -287,11 +291,11 @@ wxBEGIN_PROPERTIES_TABLE(wxWindow)
        wxEVENT_PROPERTY( Destroy , wxEVT_DESTROY , wxWindowDestroyEvent )
     // Always constructor Properties first
 
        wxEVENT_PROPERTY( Destroy , wxEVT_DESTROY , wxWindowDestroyEvent )
     // Always constructor Properties first
 

-    wxREADONLY_PROPERTY( Parent,wxWindow*, GetParent,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxREADONLY_PROPERTY( Parent,wxWindow*, GetParent, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))

        wxPROPERTY( Id,wxWindowID, SetId, GetId, -1, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
        wxPROPERTY( Position,wxPoint, SetPosition , GetPosition, wxPoint(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // pos
        wxPROPERTY( Size,wxSize, SetSize, GetSize, wxSize(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // size
        wxPROPERTY( Id,wxWindowID, SetId, GetId, -1, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
        wxPROPERTY( Position,wxPoint, SetPosition , GetPosition, wxPoint(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // pos
        wxPROPERTY( Size,wxSize, SetSize, GetSize, wxSize(-1,-1) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // size

-    wxPROPERTY( WindowStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY( WindowStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 
     // Then all relations of the object graph
 
 
     // Then all relations of the object graph
 


@@ -299,9 +303,9 @@ wxBEGIN_PROPERTIES_TABLE(wxWindow)
 
    // and finally all other properties
 
 
    // and finally all other properties
 

-       wxPROPERTY( ExtraStyle , long , SetExtraStyle , GetExtraStyle , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // extstyle
-       wxPROPERTY( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // bg
-       wxPROPERTY( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // fg
+       wxPROPERTY( ExtraStyle , long , SetExtraStyle , GetExtraStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // extstyle
+       wxPROPERTY( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // bg
+       wxPROPERTY( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // fg

        wxPROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
        wxPROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
 #if 0
        wxPROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
        wxPROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
 #if 0


@@ -904,11 +908,12 @@ void wxWindowMSW::ScrollWindow(int dx, int dy, const wxRect *prect)
     else
     {
         pr = NULL;
     else
     {
         pr = NULL;

+

     }
 
 #ifdef __WXWINCE__
     // FIXME: is this the exact equivalent of the line below?
     }
 
 #ifdef __WXWINCE__
     // FIXME: is this the exact equivalent of the line below?

-    ::ScrollWindowEx(GetHwnd(), dx, dy, pr, pr, 0, 0, SW_ERASE|SW_INVALIDATE);
+    ::ScrollWindowEx(GetHwnd(), dx, dy, pr, pr, 0, 0, SW_SCROLLCHILDREN|SW_ERASE|SW_INVALIDATE);

 #else
     ::ScrollWindow(GetHwnd(), dx, dy, pr, pr);
 #endif
 #else
     ::ScrollWindow(GetHwnd(), dx, dy, pr, pr);
 #endif


@@ -1021,8 +1026,8 @@ bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc)
        // On WinCE (at least), the wndproc comparison doesn't work,
        // so have to use something like this.
 #ifdef __WXWINCE__
        // On WinCE (at least), the wndproc comparison doesn't work,
        // so have to use something like this.
 #ifdef __WXWINCE__

-       extern const wxChar *wxCanvasClassName;
-       extern const wxChar *wxCanvasClassNameNR;
+       extern       wxChar *wxCanvasClassName;
+       extern       wxChar *wxCanvasClassNameNR;

        extern const wxChar *wxMDIFrameClassName;
        extern const wxChar *wxMDIFrameClassNameNoRedraw;
        extern const wxChar *wxMDIChildFrameClassName;
        extern const wxChar *wxMDIFrameClassName;
        extern const wxChar *wxMDIFrameClassNameNoRedraw;
        extern const wxChar *wxMDIChildFrameClassName;


@@ -3054,12 +3059,26 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
     //     level window in some smart way which we can't do, but we can
     //     guess a reasonably good size for a new window just as well
     //     ourselves
     //     level window in some smart way which we can't do, but we can
     //     guess a reasonably good size for a new window just as well
     //     ourselves

+
+       // However, on PocketPC devices, we must use the default
+       // size if possible.
+#ifdef _WIN32_WCE
+       if (size.x == -1)
+               w = CW_USEDEFAULT;
+       else
+               w = size.x;
+       if (size.y == -1)
+               h = CW_USEDEFAULT;
+       else
+               h = size.y;
+#else

     if ( size.x == -1 || size.y == -1)
     {
         nonDefault = true;
     }
     w = WidthDefault(size.x);
     h = HeightDefault(size.y);
     if ( size.x == -1 || size.y == -1)
     {
         nonDefault = true;
     }
     w = WidthDefault(size.x);
     h = HeightDefault(size.y);

+#endif

 
     AdjustForParentClientOrigin(x, y);
 
 
     AdjustForParentClientOrigin(x, y);