Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resizeable dialogs support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-06 23:27:08 +00:00
parent 26f86486b0
commit 462e243784
3 changed files with 169 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
include/wx/msw/dialog.h
View File

@@ -13,7 +13,7 @@
#define _WX_DIALOG_H_ #define _WX_DIALOG_H_
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface "dialog.h" #pragma interface "dialog.h"
#endif #endif
#include "wx/panel.h" #include "wx/panel.h"
@@ -21,102 +21,102 @@
WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr; WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
// Dialog boxes // Dialog boxes
class WXDLLEXPORT wxDialog: public wxPanel class WXDLLEXPORT wxDialog : public wxPanel
{ {
DECLARE_DYNAMIC_CLASS(wxDialog) DECLARE_DYNAMIC_CLASS(wxDialog)
protected:
bool m_modalShowing;
public: public:
wxDialog();
wxDialog();
// Constructor with a modal flag, but no window id - the old convention
// Constructor with a modal flag, but no window id - the old convention wxDialog(wxWindow *parent,
inline wxDialog(wxWindow *parent, const wxString& title, bool modal,
const wxString& title, bool modal, int x = -1, int y= -1, int width = 500, int height = 500,
int x = -1, int y= -1, int width = 500, int height = 500, long style = wxDEFAULT_DIALOG_STYLE,
long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr)
const wxString& name = wxDialogNameStr) {
{ long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ; Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), style|modalStyle, name); style | modalStyle, name);
} }
// Constructor with no modal flag - the new convention. // Constructor with no modal flag - the new convention.
inline wxDialog(wxWindow *parent, wxWindowID id, wxDialog(wxWindow *parent, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr) const wxString& name = wxDialogNameStr)
{ {
Create(parent, id, title, pos, size, style, name); Create(parent, id, title, pos, size, style, name);
} }
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxString& title, // bool modal = FALSE, // TODO make this a window style? const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr); const wxString& name = wxDialogNameStr);
~wxDialog(); ~wxDialog();
virtual bool Destroy(); virtual bool Destroy();
virtual void SetClientSize(int width, int height); virtual void SetClientSize(int width, int height);
virtual void GetPosition(int *x, int *y) const; virtual void GetPosition(int *x, int *y) const;
bool Show(bool show); bool Show(bool show);
bool IsShown() const ; bool IsShown() const;
void Iconize(bool iconize); void Iconize(bool iconize);
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
inline bool Iconized() const { return IsIconized(); }; bool Iconized() const { return IsIconized(); };
#endif #endif
virtual bool IsIconized() const; virtual bool IsIconized() const;
void Fit(); void Fit();
void SetTitle(const wxString& title); void SetTitle(const wxString& title);
wxString GetTitle() const ; wxString GetTitle() const ;
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);
void OnCharHook(wxKeyEvent& event); bool OnClose();
void OnPaint(wxPaintEvent& event); void OnCharHook(wxKeyEvent& event);
void OnCloseWindow(wxCloseEvent& event); void OnPaint(wxPaintEvent& event);
void OnCloseWindow(wxCloseEvent& event);
void SetModal(bool flag);
void SetModal(bool flag);
virtual void Centre(int direction = wxBOTH);
virtual bool IsModal() const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); } virtual void Centre(int direction = wxBOTH);
virtual bool IsModal() const
// For now, same as Show(TRUE) but returns return code { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
virtual int ShowModal();
virtual void EndModal(int retCode); // For now, same as Show(TRUE) but returns return code
virtual int ShowModal();
// Standard buttons virtual void EndModal(int retCode);
void OnOK(wxCommandEvent& event);
void OnApply(wxCommandEvent& event); // Standard buttons
void OnCancel(wxCommandEvent& event); void OnOK(wxCommandEvent& event);
void OnApply(wxCommandEvent& event);
// Responds to colour changes void OnCancel(wxCommandEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Responds to colour changes
// IMPLEMENTATION void OnSysColourChanged(wxSysColourChangedEvent& event);
virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); // IMPLEMENTATION
virtual bool MSWProcessMessage(WXMSG* pMsg); virtual bool MSWProcessMessage(WXMSG* pMsg);
// virtual bool MSWOnEraseBkgnd(WXHDC pDC); virtual bool MSWOnClose();
virtual bool MSWOnClose(); virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
inline bool IsModalShowing() const { return m_modalShowing ; } WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); bool IsModalShowing() const { return m_modalShowing; }
protected: protected:
WXHWND m_hwndOldFocus; // the window which had focus before we were shown bool m_modalShowing;
WXHWND m_hwndOldFocus; // the window which had focus before we were shown
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()
}; };
#endif #endif

7
include/wx/msw/wx.rc
View File

@@ -40,6 +40,13 @@
// Dummy Dialog for all wxCAPTION Dialog boxes // Dummy Dialog for all wxCAPTION Dialog boxes
// //
wxResizeableDialog DIALOG DISCARDABLE 34, 22, 144, 75
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION ""
BEGIN
LTEXT "", -1,-2,-2,1,1 //necessary for __WATCOMC__
END
wxCaptionDialog DIALOG DISCARDABLE 34, 22, 144, 75 wxCaptionDialog DIALOG DISCARDABLE 34, 22, 144, 75
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "Dummy dialog" CAPTION "Dummy dialog"

139
src/msw/dialog.cpp
View File

@@ -44,25 +44,19 @@ wxList wxModelessWindows; // Frames and modeless dialogs
extern wxList WXDLLEXPORT wxPendingDelete; extern wxList WXDLLEXPORT wxPendingDelete;
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
BEGIN_EVENT_TABLE(wxDialog, wxPanel)
EVT_SIZE(wxDialog::OnSize)
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
EVT_CHAR_HOOK(wxDialog::OnCharHook)
EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
EVT_CLOSE(wxDialog::OnCloseWindow)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxDialog, wxPanel)
EVT_SIZE(wxDialog::OnSize)
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
EVT_CHAR_HOOK(wxDialog::OnCharHook)
EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
EVT_CLOSE(wxDialog::OnCloseWindow)
END_EVENT_TABLE()
#endif #endif
long wxDialog::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
return ::CallWindowProc(CASTWNDPROC m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
}
bool wxDialog::MSWProcessMessage(WXMSG* pMsg) bool wxDialog::MSWProcessMessage(WXMSG* pMsg)
{ {
return (::IsDialogMessage((HWND) GetHWND(), (MSG*)pMsg) != 0); return (::IsDialogMessage((HWND) GetHWND(), (MSG*)pMsg) != 0);
@@ -82,65 +76,80 @@ wxDialog::wxDialog(void)
} }
bool wxDialog::Create(wxWindow *parent, wxWindowID id, bool wxDialog::Create(wxWindow *parent, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
const wxString& name) const wxString& name)
{ {
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
SetName(name); SetName(name);
if (!parent) if (!parent)
wxTopLevelWindows.Append(this); wxTopLevelWindows.Append(this);
// windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL); // windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);
if (parent) parent->AddChild(this); if (parent) parent->AddChild(this);
if ( id == -1 ) if ( id == -1 )
m_windowId = (int)NewControlId(); m_windowId = (int)NewControlId();
else else
m_windowId = id; m_windowId = id;
int x = pos.x; int x = pos.x;
int y = pos.y; int y = pos.y;
int width = size.x; int width = size.x;
int height = size.y; int height = size.y;
if (x < 0) x = wxDIALOG_DEFAULT_X; if (x < 0) x = wxDIALOG_DEFAULT_X;
if (y < 0) y = wxDIALOG_DEFAULT_Y; if (y < 0) y = wxDIALOG_DEFAULT_Y;
m_windowStyle = style; m_windowStyle = style;
m_isShown = FALSE; m_isShown = FALSE;
m_modalShowing = FALSE; m_modalShowing = FALSE;
if (width < 0) if (width < 0)
width = 500; width = 500;
if (height < 0) if (height < 0)
height = 500; height = 500;
WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle); WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
if (m_windowStyle & wxSTAY_ON_TOP) if (m_windowStyle & wxSTAY_ON_TOP)
extendedStyle |= WS_EX_TOPMOST; extendedStyle |= WS_EX_TOPMOST;
// Allows creation of dialogs with & without captions under MSWindows // Allows creation of dialogs with & without captions under MSWindows,
if(style & wxCAPTION){ // resizeable or not (but a resizeable dialog always has caption -
MSWCreate(m_windowId, (wxWindow *)parent, NULL, this, NULL, x, y, width, height, 0, "wxCaptionDialog", // otherwise it would look too strange)
extendedStyle); const char *dlg;
} if ( style & wxTHICK_FRAME )
else{ dlg = "wxResizeableDialog";
MSWCreate(m_windowId, (wxWindow *)parent, NULL, this, NULL, x, y, width, height, 0, "wxNoCaptionDialog", else if ( style & wxCAPTION )
extendedStyle); dlg = "wxCaptionDialog";
} else
dlg = "wxNoCaptionDialog";
MSWCreate(m_windowId, parent, NULL, this, NULL,
x, y, width, height,
0, // style is not used if we have dlg template
dlg,
extendedStyle);
SubclassWin(GetHWND()); HWND hwnd = (HWND)GetHWND();
SetWindowText((HWND) GetHWND(), (const char *)title); if ( !hwnd )
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); {
wxLogError(_("Failed to created dialog."));
return TRUE; return FALSE;
}
SubclassWin(GetHWND());
SetWindowText(hwnd, title);
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE;
} }
void wxDialog::SetModal(bool flag) void wxDialog::SetModal(bool flag)
@@ -610,10 +619,4 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
Refresh(); Refresh();
#endif #endif
} }
long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
return wxWindow::MSWWindowProc(message, wParam, lParam);
}