luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DEVELOPMENT ENVIRONMENT]

Browse Source 
* NEW: Double-click is needed to modify a value in the debugger. But now
  you can't reset an object value to NULL. Something to fix later...

[GB.DEBUG]
* BUG: Fix an uninitialized value that made the debugger crash when 
  trying to see if an object can act like an array.

[GB.PDF]
* BUG: Make gb.pdf compile with poppler >= 0.11.3.


git-svn-id: svn://localhost/gambas/trunk@2268 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2009-08-24 23:30:23 +00:00
parent 81fcbc10e4
commit bd15563f2f
7 changed files with 52 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/gambas3/.project
View File

@ -1,5 +1,5 @@
# Gambas Project File 3.0
# Compiled with Gambas 2.99.0 (r2258)
# Compiled with Gambas 2.99.0 (r2267)
Title=Gambas 3
Startup=Project
StackTrace=1

67
app/src/gambas3/.src/Debug/FDebugExpr.class
View File

@ -236,29 +236,43 @@ Public Sub gvwExpr_Activate()
Dim sText As String
Dim sVal As String
Dim sExpr As String
Dim sSym As String
If gvwExpr.Row >= 0 Then
sText = gvwExpr[gvwExpr.Row, 0].Text
If Not sText Or Right(sText) = ":" Then Return
sVal = gvwExpr[gvwExpr.Row, 1].Text
'If Left(sVal) <> "(" Then Return
If Not $bArray And If Not $bCollection Then
sSym = $aSym[gvwExpr.Row]
If Left(sSym) = ":" Then Return
Endif
If $bArray Or $bCollection
sText = $sExpr & "[" & sText & "]"
Else
If Left($sClass) = "." Or If Not $sRealClass Then
sText = $sExpr & "." & sText
Else
'sText = $sExpr & "." & sText
sText = $sRealClass & "(" & $sExpr & ")." & sText
Endif
Endif
sText = gvwExpr[gvwExpr.Row, 0].Text
If Not sText Then Return
sVal = gvwExpr[gvwExpr.Row, 1].Text
With gvwExpr[gvwExpr.Row, 1]
Design.SetBalloon(gvwExpr, .X + .W / 2, .Y + .H / 2)
End With
OpenExpr(sText)
If Left(sVal) = "(" Then
If $bArray Or $bCollection
sText = $sExpr & "[" & sText & "]"
Else
If Left($sClass) = "." Or If Not $sRealClass Then
sText = $sExpr & "." & sText
Else
'sText = $sExpr & "." & sText
sText = $sRealClass & "(" & $sExpr & ")." & sText
Endif
Endif
With gvwExpr[gvwExpr.Row, 1]
Design.SetBalloon(gvwExpr, .X + .W / 2, .Y + .H / 2)
End With
OpenExpr(sText)
Else
gvwExpr.Column = 1
gvwExpr.Edit
Endif
Endif
@ -403,6 +417,7 @@ Private Sub Init(sInfo As String, bNew As Boolean) As Boolean
With gvwExpr
.Columns.Count = 2
If nRow > 1024 Then Stop
.Rows.Count = nRow
If $bArray Then
@ -684,20 +699,6 @@ Public Sub gvwExpr_Scroll()
End
Public Sub gvwExpr_Click()
Dim sSym As String
If gvwExpr.Column = 1 Then
If Not $bArray And If Not $bCollection Then
sSym = $aSym[gvwExpr.Row]
If Left(sSym) = ":" Then Return
Endif
gvwExpr.Edit
Endif
End
Public Sub gvwExpr_Save(Row As Integer, Column As Integer, Value As String)
Dim sSym As String

24
app/src/gambas3/.src/Debug/FDebugInfo.class
View File

@ -648,8 +648,12 @@ Public Sub tbvLocal_Activate()
Dim sVal As String = hTable[hTable.Row, 1].Text
If Right(sExpr) = ":" Then Return
If Left(sVal) <> "(" Then Return
Design.Command("#X" & sExpr & "\t" & sExpr)
If Left(sVal) = "(" Then
Design.Command("#X" & sExpr & "\t" & sExpr)
Else
hTable.Column = 1
hTable.Edit
Endif
End
@ -871,7 +875,6 @@ Public Sub tbvLocal_Data(Row As Integer, Column As Integer)
If Right(sVar) = ":" Then
.Font.Bold = True
.Font.Underline = True
Debug sVar
.Text = If(UCase(sVar) = "S:", ("Static variables"), ("Dynamic variables"))
Else
.Text = sVar
@ -890,21 +893,6 @@ Public Sub tbvObject_Data(Row As Integer, Column As Integer)
End
Public Sub tbvLocal_Click()
Dim hView As TableView = Last
If hView.Column = 1 Then
If Right(hView[hView.Row, 0].Text) <> ":" Then hView.Edit
Endif
End
Public Sub tbvObject_Click()
tbvLocal_Click
End
Public Sub tbvLocal_Save(Row As Integer, Column As Integer, Value As String)
Dim sVar As String = tbvLocal[Row, 0].Text

4
gb.opengl/src/GLselectFeedback.c
View File

@ -108,8 +108,8 @@ BEGIN_METHOD(GLRENDERMODE, GB_INTEGER Mode)
GLuint *hitbuffer = selectbuffer;
int idxhit, idxname;
//GB.New(&hitArray, GB_T_OBJECT, result);
GB.New(POINTER(&hitArray), GB.FindClass("Integer[][]"), NULL, NULL);
GB.Array.New(&hitArray, GB.FindClass("Integer[]"), result);
//GB.New(POINTER(&hitArray), GB.FindClass("Integer[][]"), NULL, NULL);
for (idxhit=0; idxhit < result; idxhit++)
{

2
gb.pdf/configure.ac
View File

@ -20,6 +20,8 @@ if test "$have_poppler" = "yes"; then
AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_6, $((1-$?)), Poppler version >= 0.6)
pkg-config --atleast-version=0.8.0 poppler
AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8)
pkg-config --atleast-version=0.11.3 poppler
AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
fi
AC_OUTPUT( \

11
gb.pdf/src/CPdfDocument.cpp
View File

@ -504,12 +504,13 @@ END_PROPERTY
BEGIN_PROPERTY(PDFINFO_format)
char *ctx=NULL;
GB.Alloc(POINTER(&ctx),16*sizeof(char));
snprintf(ctx,16*sizeof(char),"%.2g",THIS->doc->getPDFVersion());
char ctx[16];
#if POPPLER_VERSION_0_11_3
snprintf(ctx, sizeof(ctx), "%.2g", THIS->doc->getPDFMajorVersion () + THIS->doc->getPDFMinorVersion() / 10.0);
#else
snprintf(ctx, sizeof(ctx), "%.2g", THIS->doc->getPDFVersion());
#endif
GB.ReturnNewZeroString(ctx);
GB.Free(POINTER(&ctx));
END_PROPERTY

2
main/lib/debug/print.c
View File

@ -312,7 +312,7 @@ void PRINT_object(FILE *where, VALUE *value)
VALUE conv;
void *object;
int i, index;
int count;
int count = 0;
CLASS *class, *real_class;
CLASS_DESC_SYMBOL *cd;
char *key;