updated VC build instructions

[wxWidgets.git] / wxPython / src / _window.i

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 92c48f1a83421f8756a4c39380a7d14d3640899b..9c07523c3e54b42a86c6b86e3626f6bbae8191f0 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -588,8 +588,8 @@ sizer, interior children, or other means)");
         virtual bool , Show( bool show = True ),
         "Shows or hides the window. You may need to call Raise for a top level
 window if you want to bring it to top, although this is not needed if
         virtual bool , Show( bool show = True ),
         "Shows or hides the window. You may need to call Raise for a top level
 window if you want to bring it to top, although this is not needed if

-Show() is called immediately after the frame creation.  Returns true
-if the window has been shown or hidden or false if nothing was done
+Show is called immediately after the frame creation.  Returns True if
+the window has been shown or hidden or False if nothing was done

 because it already was in the requested state.");
     
     DocDeclStr(
 because it already was in the requested state.");
     
     DocDeclStr(


@@ -629,7 +629,8 @@ after changing the others for the change to take place immediately.");
     
     DocDeclStr(
         virtual long , GetWindowStyleFlag() const,
     
     DocDeclStr(
         virtual long , GetWindowStyleFlag() const,

-        "Gets the window style that was passed to the constructor or Create method.");    
+        "Gets the window style that was passed to the constructor or Create
+method.");    

 
     %pythoncode { SetWindowStyle = SetWindowStyleFlag; GetWindowStyle = GetWindowStyleFlag }
     
 
     %pythoncode { SetWindowStyle = SetWindowStyleFlag; GetWindowStyle = GetWindowStyleFlag }
     


@@ -723,8 +724,7 @@ or None.");
         virtual bool , AcceptsFocusFromKeyboard() const,
         "Can this window be given focus by keyboard navigation? if not, the
 only way to give it focus (provided it accepts it at all) is to click
         virtual bool , AcceptsFocusFromKeyboard() const,
         "Can this window be given focus by keyboard navigation? if not, the
 only way to give it focus (provided it accepts it at all) is to click

-it.
-");
+it.");

     
 
 
     
 
 


@@ -732,8 +732,7 @@ it.
     DocDeclStr(
         virtual wxWindow *, GetDefaultItem() const,
         "Get the default child of this parent, i.e. the one which is activated
     DocDeclStr(
         virtual wxWindow *, GetDefaultItem() const,
         "Get the default child of this parent, i.e. the one which is activated

-by pressing <Enter> such as the OK button on a wx.Dialog.
-");
+by pressing <Enter> such as the OK button on a wx.Dialog.");

     
     DocDeclStr(
         virtual wxWindow *, SetDefaultItem(wxWindow * child),
     
     DocDeclStr(
         virtual wxWindow *, SetDefaultItem(wxWindow * child),


@@ -946,8 +945,8 @@ hotkey was registered successfully.");
     // ---------------------------
 
     DocStr(ConvertDialogToPixels,
     // ---------------------------
 
     DocStr(ConvertDialogToPixels,

-           "Converts a point or size from dialog units to pixels.  Dialog units are
-used for maintaining a dialog's proportions even if the font
+           "Converts a point or size from dialog units to pixels.  Dialog units
+are used for maintaining a dialog's proportions even if the font

 changes. For the x dimension, the dialog units are multiplied by the
 average character width and then divided by 4. For the y dimension,
 the dialog units are multiplied by the average character height and
 changes. For the x dimension, the dialog units are multiplied by the
 average character width and then divided by 4. For the y dimension,
 the dialog units are multiplied by the average character height and


@@ -1692,8 +1691,8 @@ wxWindow* wxFindWindowByLabel( const wxString& label,
     wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
 #ifdef __WXMSW__
         wxWindow* win = new wxWindow;
     wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
 #ifdef __WXMSW__
         wxWindow* win = new wxWindow;

-        win->SetHWND(hWnd);
-        win->SubclassWin(hWnd);
+        win->SetHWND((WXHWND)hWnd);
+        win->SubclassWin((WXHWND)hWnd);

         return win;
 #else
         wxPyRaiseNotImplemented();
         return win;
 #else
         wxPyRaiseNotImplemented();