implemented DrawPoint in terms of DrawLine (for now)

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

diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index a99ce0c36291beb614c81e45c0cb77ccdf0adad2..e3d24ec1923a398751ccce30470ab523f493840d 100644 (file)
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -53,14 +53,19 @@ enum
 
     wxFRAME_EX_METAL,
     wxDIALOG_EX_METAL,
 
     wxFRAME_EX_METAL,
     wxDIALOG_EX_METAL,

+    wxWS_EX_CONTEXTHELP,

     
     // Obsolete
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,
     wxUSER_COLOURS,
     wxNO_3D,
     
     // Obsolete
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,
     wxUSER_COLOURS,
     wxNO_3D,

+
+    wxFRAME_EX_CONTEXTHELP,
+    wxDIALOG_EX_CONTEXTHELP,

 };    
 
 };    
 

+

 enum
 {
     wxFULLSCREEN_NOMENUBAR,
 enum
 {
     wxFULLSCREEN_NOMENUBAR,


@@ -171,9 +176,25 @@ public:
     }
 #endif
 
     }
 #endif
 

-    virtual bool SetTransparent(byte alpha); 
-    virtual bool CanSetTransparent();
+    
+    
+    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.", "");
+    
+    DocDeclStr(
+        virtual wxWindow *, SetDefaultItem(wxWindow * child),
+        "Set this child as default, return the old default.", "");
+    
+    DocDeclStr(
+        virtual void , SetTmpDefaultItem(wxWindow * win),
+        "Set this child as temporary default", "");

 
 

+    DocDeclStr(
+        virtual wxWindow *, GetTmpDefaultItem() const,
+        "Return the temporary default item, which can be None.", "");
+       

 };
 
 
 };
 
 


@@ -297,6 +318,11 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

+
+    %property(MenuBar, GetMenuBar, SetMenuBar, doc="See `GetMenuBar` and `SetMenuBar`");
+    %property(StatusBar, GetStatusBar, SetStatusBar, doc="See `GetStatusBar` and `SetStatusBar`");
+    %property(StatusBarPane, GetStatusBarPane, SetStatusBarPane, doc="See `GetStatusBarPane` and `SetStatusBarPane`");
+    %property(ToolBar, GetToolBar, SetToolBar, doc="See `GetToolBar` and `SetToolBar`");

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -342,11 +368,15 @@ public:
     void SetReturnCode(int returnCode);
     int GetReturnCode() const;
 
     void SetReturnCode(int returnCode);
     int GetReturnCode() const;
 

-    // The identifier for the affirmative button
+    // Set the identifier for the affirmative button: this button will close
+    // the dialog after validating data and calling TransferDataFromWindow()

     void SetAffirmativeId(int affirmativeId);
     int GetAffirmativeId() const;
 
     void SetAffirmativeId(int affirmativeId);
     int GetAffirmativeId() const;
 

-    // Identifier for Esc key translation
+    // Set identifier for Esc key translation: the button with this id will
+    // close the dialog without doing anything else; special value wxID_NONE
+    // means to not handle Esc at all while wxID_ANY means to map Esc to
+    // wxID_CANCEL if present and GetAffirmativeId() otherwise

     void SetEscapeId(int escapeId);
     int GetEscapeId() const;
 
     void SetEscapeId(int escapeId);
     int GetEscapeId() const;
 


@@ -374,6 +404,10 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

+
+    %property(AffirmativeId, GetAffirmativeId, SetAffirmativeId, doc="See `GetAffirmativeId` and `SetAffirmativeId`");
+    %property(EscapeId, GetEscapeId, SetEscapeId, doc="See `GetEscapeId` and `SetEscapeId`");
+    %property(ReturnCode, GetReturnCode, SetReturnCode, doc="See `GetReturnCode` and `SetReturnCode`");

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------