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

Small changed to wxExtDialog

Browse Source 
Made DnD use long instead of int
  Made DnD sample compile again
  Re-Updated wxTextDialog
  Added GetDefaultSize() to wxButton


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-07-04 13:50:13 +00:00
parent ba059d80b4
commit 8dbf458911
18 changed files with 368 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk1/app.cpp
View File

@@ -225,6 +225,7 @@ void wxapp_install_idle_handler()
g_isIdle = FALSE;
}
/*
#if wxUSE_THREADS
static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
{
@@ -232,23 +233,23 @@ static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
wxTheApp->m_wakeUpTimerTag = 0;
#if (GTK_MINOR_VERSION > 0)
/* when getting called from GDK's time-out handler
we are no longer within GDK's grab on the GUI
thread so we must lock it here ourselves */
// when getting called from GDK's time-out handler
// we are no longer within GDK's grab on the GUI
// thread so we must lock it here ourselves
GDK_THREADS_ENTER ();
#endif
/* unblock other threads wishing to do some GUI things */
// unblock other threads wishing to do some GUI things
wxMutexGuiLeave();
/* wake up other threads */
// wake up other threads
wxUsleep( 1 );
/* block other thread again */
// block other thread again
wxMutexGuiEnter();
#if (GTK_MINOR_VERSION > 0)
/* release lock again */
// release lock again
GDK_THREADS_LEAVE ();
#endif
@@ -257,6 +258,7 @@ static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
return TRUE;
}
#endif
*/
//-----------------------------------------------------------------------------
// wxApp
@@ -277,9 +279,11 @@ wxApp::wxApp()
m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
/*
#if wxUSE_THREADS
m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
#endif
*/
m_colorCube = (unsigned char*) NULL;
}
@@ -288,9 +292,11 @@ wxApp::~wxApp()
{
if (m_idleTag) gtk_idle_remove( m_idleTag );
/*
#if wxUSE_THREADS
if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag );
#endif
*/
if (m_colorCube) free(m_colorCube);
}

5
src/gtk1/button.cpp
View File

@@ -120,6 +120,11 @@ void wxButton::SetDefault(void)
SetSize( m_x, m_y, m_width, m_height );
}
static wxSize wxButton::GetDefaultSize()
{
return wxSize(80,26);
}
void wxButton::SetLabel( const wxString &label )
{
wxCHECK_RET( m_widget != NULL, _T("invalid button") );

24
src/gtk1/dnd.cpp
View File

@@ -337,17 +337,17 @@ void wxDropTarget::OnLeave()
{
}
bool wxDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
bool wxDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )
{
return TRUE;
}
bool wxDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
bool wxDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) )
{
return FALSE;
}
bool wxDropTarget::OnData( int WXUNUSED(x), int WXUNUSED(y) )
bool wxDropTarget::OnData( long WXUNUSED(x), long WXUNUSED(y) )
{
return FALSE;
}
@@ -472,12 +472,12 @@ void wxDropTarget::RegisterWidget( GtkWidget *widget )
// wxTextDropTarget
//-------------------------------------------------------------------------
bool wxTextDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
bool wxTextDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )
{
return IsSupported( wxDF_TEXT );
}
bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
bool wxTextDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) )
{
if (IsSupported( wxDF_TEXT ))
{
@@ -488,7 +488,7 @@ bool wxTextDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
return FALSE;
}
bool wxTextDropTarget::OnData( int x, int y )
bool wxTextDropTarget::OnData( long x, long y )
{
wxTextDataObject data;
if (!GetData( &data )) return FALSE;
@@ -512,12 +512,12 @@ wxPrivateDropTarget::wxPrivateDropTarget( const wxString &id )
m_id = id;
}
bool wxPrivateDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
bool wxPrivateDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )
{
return IsSupported( m_id );
}
bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
bool wxPrivateDropTarget::OnDrop( long WXUNUSED(x), long WXUNUSED(y) )
{
if (!IsSupported( m_id ))
{
@@ -528,7 +528,7 @@ bool wxPrivateDropTarget::OnDrop( int WXUNUSED(x), int WXUNUSED(y) )
return FALSE;
}
bool wxPrivateDropTarget::OnData( int x, int y )
bool wxPrivateDropTarget::OnData( long x, long y )
{
if (!IsSupported( m_id )) return FALSE;
@@ -544,12 +544,12 @@ bool wxPrivateDropTarget::OnData( int x, int y )
// A drop target which accepts files (dragged from File Manager or Explorer)
//----------------------------------------------------------------------------
bool wxFileDropTarget::OnMove( int WXUNUSED(x), int WXUNUSED(y) )
bool wxFileDropTarget::OnMove( long WXUNUSED(x), long WXUNUSED(y) )
{
return IsSupported( wxDF_FILENAME );
}
bool wxFileDropTarget::OnDrop( int x, int y )
bool wxFileDropTarget::OnDrop( long x, long y )
{
if (IsSupported( wxDF_FILENAME ))
{
@@ -560,7 +560,7 @@ bool wxFileDropTarget::OnDrop( int x, int y )
return FALSE;
}
bool wxFileDropTarget::OnData( int x, int y )
bool wxFileDropTarget::OnData( long x, long y )
{
wxFileDataObject data;
if (!GetData( &data )) return FALSE;

198
src/gtk1/textdlg.cpp
View File

@@ -21,19 +21,58 @@
#endif
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/listbox.h"
#include "wx/button.h"
#include "wx/stattext.h"
#include "wx/textctrl.h"
#include "wx/layout.h"
#include "wx/intl.h"
#include <stdio.h>
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/button.h"
#include "wx/stattext.h"
#include "wx/textctrl.h"
#include "wx/intl.h"
#endif
#if wxUSE_STATLINE
#include "wx/statline.h"
#endif
#include "wx/gtk/textdlg.h"
/* Split message, using constraints to position controls */
static wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )
{
int y = 10;
int w = 50;
wxString line( _T("") );
for (size_t pos = 0; pos < message.Len(); pos++)
{
if (message[pos] == _T('\n'))
{
if (!line.IsEmpty())
{
wxStaticText *s1 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
wxSize size1( s1->GetSize() );
if (size1.x > w) w = size1.x;
line = _T("");
}
y += 18;
}
else
{
line += message[pos];
}
}
if (!line.IsEmpty())
{
wxStaticText *s2 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
wxSize size2( s2->GetSize() );
if (size2.x > w) w = size2.x;
}
y += 18;
return wxSize(w+30,y);
}
// wxTextEntryDialog
#if !USE_SHARED_LIBRARY
@@ -44,109 +83,70 @@ END_EVENT_TABLE()
IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
#endif
// Split message, using constraints to position controls
static void wxSplitMessage2(const wxChar *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer)
{
wxChar *copyMessage = copystring(message);
size_t i = 0;
size_t len = wxStrlen(copyMessage);
wxChar *currentMessage = copyMessage;
// wxWindow *lastWindow = parent;
while (i < len) {
while ((i < len) && (copyMessage[i] != _T('\n'))) i++;
if (i < len) copyMessage[i] = 0;
wxStaticText *mess = new wxStaticText(parent, -1, currentMessage);
/*
wxLayoutConstraints *c = new wxLayoutConstraints;
c->left.SameAs (parent, wxLeft, 10);
c->top.SameAs (lastWindow, wxBottom, 5);
c->right.AsIs ();
c->height.AsIs ();
mess->SetConstraints(c);
*/
sizer->AddSizerChild(mess);
messageList->Append(mess);
currentMessage = copyMessage + i + 1;
}
delete[] copyMessage;
}
wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, const wxString& message, const wxString& caption,
const wxString& value, long style, const wxPoint& pos):
wxDialog(parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxTAB_TRAVERSAL)
{
m_dialogStyle = style;
m_value = value;
m_dialogStyle = style;
m_value = value;
wxBeginBusyCursor();
wxBeginBusyCursor();
wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
topSizer->SetBorder(10, 10);
wxSize message_size( wxSplitMessage2( message, this ) );
wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
messageSizer->SetName("messageSizer");
wxButton *ok = (wxButton *) NULL;
wxButton *cancel = (wxButton *) NULL;
wxList m_buttons;
int y = message_size.y + 15;
wxTextCtrl *textCtrl = new wxTextCtrl(this, wxID_TEXT, value, wxPoint(-1, y), wxSize(350, -1));
y += 65;
// bool centre = ((style & wxCENTRE) == wxCENTRE);
if (style & wxOK)
{
ok = new wxButton( this, wxID_OK, _("OK"), wxPoint(-1,y), wxSize(80,-1) );
m_buttons.Append( ok );
}
wxList messageList;
wxSplitMessage2(message, &messageList, this, messageSizer);
if (style & wxCANCEL)
{
cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxPoint(-1,y), wxSize(80,-1) );
m_buttons.Append( cancel );
}
// Insert a spacer
wxSpacingSizer *spacingSizer = new wxSpacingSizer(topSizer, wxBelow, messageSizer, 10);
if (ok)
{
ok->SetDefault();
ok->SetFocus();
}
wxTextCtrl *textCtrl = new wxTextCtrl(this, wxID_TEXT, value, wxPoint(-1, -1), wxSize(350, -1));
int w = wxMax( 350, m_buttons.GetCount() * 100 );
w = wxMax( w, message_size.x );
int space = w / (m_buttons.GetCount()*2);
textCtrl->SetSize( 20, -1, w-10, -1 );
int m = 0;
wxNode *node = m_buttons.First();
while (node)
{
wxWindow *win = (wxWindow*)node->Data();
int x = (m*2+1)*space - 40 + 15;
win->Move( x, -1 );
node = node->Next();
m++;
}
#if wxUSE_STATLINE
(void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
#endif
SetSize( w+30, y+40 );
wxRowColSizer *textSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
textSizer->AddSizerChild(textCtrl);
textSizer->SetName("textSizer");
Centre( wxBOTH );
// Create constraints for the text sizer
wxLayoutConstraints *textC = new wxLayoutConstraints;
textC->left.SameAs (messageSizer, wxLeft);
textC->top.Below (spacingSizer);
textSizer->SetConstraints(textC);
// Insert another spacer
wxSpacingSizer *spacingSizer2 = new wxSpacingSizer(topSizer, wxBelow, textSizer, 10);
spacingSizer->SetName("spacingSizer2");
// Insert a sizer for the buttons
wxRowColSizer *buttonSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
buttonSizer->SetName("buttonSizer");
// Specify constraints for the button sizer
wxLayoutConstraints *c = new wxLayoutConstraints;
c->width.AsIs ();
c->height.AsIs ();
c->top.Below (spacingSizer2);
c->centreX.SameAs (textSizer, wxCentreX);
buttonSizer->SetConstraints(c);
buttonSizer->SetSpacing(12,0);
wxButton *ok = NULL;
wxButton *cancel = NULL;
if (style & wxOK) {
ok = new wxButton(this, wxID_OK, _("OK"), wxDefaultPosition, wxSize(75,-1));
buttonSizer->AddSizerChild(ok);
}
if (style & wxCANCEL) {
cancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(75,-1));
buttonSizer->AddSizerChild(cancel);
}
if (ok)
ok->SetDefault();
Layout();
Centre(wxBOTH);
wxEndBusyCursor();
}