Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / dialog.h

diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h
index 69a58d43a8a4193e2b0f925c6cbf885942886ab7..994b7d36c7f012143f0a04723ac06e4fe670df57 100644 (file)
--- a/interface/wx/dialog.h
+++ b/interface/wx/dialog.h
@@ -88,7 +88,7 @@ enum wxDialogLayoutAdaptationMode
            Equivalent to a combination of wxCAPTION, wxCLOSE_BOX and
            wxSYSTEM_MENU (the last one is not used under Unix).
     @style{wxRESIZE_BORDER}
            Equivalent to a combination of wxCAPTION, wxCLOSE_BOX and
            wxSYSTEM_MENU (the last one is not used under Unix).
     @style{wxRESIZE_BORDER}

-           Display a resizeable frame around the window.
+           Display a resizable frame around the window.

     @style{wxSYSTEM_MENU}
            Display a system menu.
     @style{wxCLOSE_BOX}
     @style{wxSYSTEM_MENU}
            Display a system menu.
     @style{wxCLOSE_BOX}


@@ -112,7 +112,7 @@ enum wxDialogLayoutAdaptationMode
     @style{wxDIALOG_EX_CONTEXTHELP}
            Under Windows, puts a query button on the caption. When pressed,
            Windows will go into a context-sensitive help mode and wxWidgets
     @style{wxDIALOG_EX_CONTEXTHELP}
            Under Windows, puts a query button on the caption. When pressed,
            Windows will go into a context-sensitive help mode and wxWidgets

-           will send a wxEVT_HELP event if the user clicked on an application
+           will send a @c wxEVT_HELP event if the user clicked on an application

            window. Note that this is an extended style and must be set by
            calling SetExtraStyle() before Create is called (two-step
            construction).
            window. Note that this is an extended style and must be set by
            calling SetExtraStyle() before Create is called (two-step
            construction).


@@ -452,7 +452,7 @@ public:
     virtual bool IsModal() const;
 
     /**
     virtual bool IsModal() const;
 
     /**

-        The default handler for wxEVT_SYS_COLOUR_CHANGED.
+        The default handler for @c wxEVT_SYS_COLOUR_CHANGED.

 
         @param event
             The colour change event.
 
         @param event
             The colour change event.


@@ -472,7 +472,7 @@ public:
         Sets the identifier to be used as OK button. When the button with this
         identifier is pressed, the dialog calls wxWindow::Validate() and
         wxWindow::TransferDataFromWindow() and, if they both return @true,
         Sets the identifier to be used as OK button. When the button with this
         identifier is pressed, the dialog calls wxWindow::Validate() and
         wxWindow::TransferDataFromWindow() and, if they both return @true,

-        closes the dialog with wxID_OK return code.
+        closes the dialog with the affirmative id return code.

 
         Also, when the user presses a hardware OK button on the devices having
         one or the special OK button in the PocketPC title bar, an event with
 
         Also, when the user presses a hardware OK button on the devices having
         one or the special OK button in the PocketPC title bar, an event with


@@ -594,7 +594,7 @@ public:
     virtual bool Show(bool show = 1);
 
     /**
     virtual bool Show(bool show = 1);
 
     /**

-        Shows a modal dialog.
+        Shows an application-modal dialog.

 
         Program flow does not return until the dialog has been dismissed with
         EndModal().
 
         Program flow does not return until the dialog has been dismissed with
         EndModal().


@@ -611,9 +611,26 @@ public:
 
         @return The value set with SetReturnCode().
 
 
         @return The value set with SetReturnCode().
 

-        @see EndModal(), GetReturnCode(), SetReturnCode()
+        @see ShowWindowModal(), EndModal(), GetReturnCode(), SetReturnCode()

     */
     virtual int ShowModal();
     */
     virtual int ShowModal();

+
+    /**
+        Shows a dialog modal to the parent top level window only.
+
+        Unlike ShowModal(), dialogs shown with this function only prevent the
+        user from interacting with their parent frame only but not with the
+        rest of the application. They also don't block the program execution
+        but instead return immediately, as Show(), and generate a
+        wxEVT_WINDOW_MODAL_DIALOG_CLOSED event later when the dialog is closed.
+
+        Currently this function is only fully implemented in wxOSX ports, under
+        the other platforms it behaves like ShowModal() (but also sends the
+        above mentioned event).
+
+        @since 2.9.0
+     */
+    void ShowWindowModal();

 };
 
 
 };
 
 


@@ -621,7 +638,7 @@ public:
 /**
     @class wxDialogLayoutAdapter
 
 /**
     @class wxDialogLayoutAdapter
 

-    This abstract class is the base for classes that help wxWidgets peform
+    This abstract class is the base for classes that help wxWidgets perform

     run-time layout adaptation of dialogs. Principally, this is to cater for
     small displays by making part of the dialog scroll, but the application
     developer may find other uses for layout adaption.
     run-time layout adaptation of dialogs. Principally, this is to cater for
     small displays by making part of the dialog scroll, but the application
     developer may find other uses for layout adaption.